rpms/selinux-policy/devel selinux-policy.spec,1.506,1.507
Daniel J Walsh (dwalsh)
fedora-extras-commits at redhat.com
Fri Aug 24 21:10:17 UTC 2007
Author: dwalsh
Update of /cvs/extras/rpms/selinux-policy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2373
Modified Files:
selinux-policy.spec
Log Message:
* Fri Aug 24 2007 Dan Walsh <dwalsh at redhat.com> 3.0.6-3
- Cleanup spec file
Index: selinux-policy.spec
===================================================================
RCS file: /cvs/extras/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.506
retrieving revision 1.507
diff -u -r1.506 -r1.507
--- selinux-policy.spec 24 Aug 2007 20:44:19 -0000 1.506
+++ selinux-policy.spec 24 Aug 2007 21:09:44 -0000 1.507
@@ -79,8 +79,8 @@
%define setupCmds() \
make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 MLS_CATS=1024 MCS_CATS=1024 bare \
make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 MLS_CATS=1024 MCS_CATS=1024 conf \
-cp -f ${RPM_BUILD_ROOT}/modules-%1.conf ./policy/modules.conf \
-cp -f ${RPM_BUILD_ROOT}/booleans-%1.conf ./policy/booleans.conf \
+cp -f $RPM_SOURCE_DIR/modules-%1.conf ./policy/modules.conf \
+cp -f $RPM_SOURCE_DIR/booleans-%1.conf ./policy/booleans.conf \
%define moduleList() %([ -f $RPM_BUILD_ROOT/modules-%{1}.conf ] && \
awk '$1 !~ "/^#/" && $2 == "=" && $3 == "module" { printf "-i %%s.pp ", $1 }' $RPM_BUILD_ROOT/modules-%{1}.conf )
@@ -102,8 +102,8 @@
touch %{buildroot}%{_sysconfdir}/selinux/%1/contexts/files/file_contexts \
touch %{buildroot}%{_sysconfdir}/selinux/%1/contexts/files/homedir_template \
touch %{buildroot}%{_sysconfdir}/selinux/%1/contexts/files/file_contexts.homedirs \
-install -m0644 ${RPM_BUILD_ROOT}/securetty_types-%1 %{buildroot}%{_sysconfdir}/selinux/%1/contexts/securetty_types \
-install -m0644 ${RPM_BUILD_ROOT}/setrans-%1.conf %{buildroot}%{_sysconfdir}/selinux/%1/setrans.conf \
+install -m0644 $RPM_SOURCE_DIR/securetty_types-%1 %{buildroot}%{_sysconfdir}/selinux/%1/contexts/securetty_types \
+install -m0644 $RPM_SOURCE_DIR/setrans-%1.conf %{buildroot}%{_sysconfdir}/selinux/%1/setrans.conf \
%nil
%define fileList() \
More information about the scm-commits
mailing list