rpms/selinux-policy-targeted/FC-3 selinux-policy-targeted.spec, 1.220, 1.221

Tue Jul 12 19:40:12 UTC 2005

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy-targeted/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv28442

Modified Files:
	selinux-policy-targeted.spec 
Log Message:
* Tue Jul 12 2005 Dan Walsh <dwalsh at redhat.com> 1.17.30-3.19
- Allow nscd to use tun_tap device
- Add winbind_helper
- Allow apache to work with ldap
- Fix load_policy line in spec file



Index: selinux-policy-targeted.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-3/selinux-policy-targeted.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221

--- selinux-policy-targeted.spec	12 Jul 2005 19:06:00 -0000	1.220
+++ selinux-policy-targeted.spec	12 Jul 2005 19:40:08 -0000	1.221
@@ -7,7 +7,7 @@
 Summary: SELinux %{type} policy configuration
 Name: selinux-policy-%{type}
 Version: 1.17.30
-Release: 3.18
+Release: 3.19
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz
@@ -145,10 +145,7 @@
 if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled && [ -e /selinux/policyvers ]; then
 	. /etc/selinux/config
 	if [ "${SELINUXTYPE}" = "%{type}" -a ! -s %{POLICYDIR}/src/policy/Makefile ]; then
-		POLICYFILE=%{POLICYDIR}/policy/policy.`cat /selinux/policyvers`
-		if [ ! -f $POLICYFILE ]; then
-			POLICYFILE=%{POLICYDIR}/policy/policy.%{POLICYVER}
-		endif
+		POLICYFILE=%{POLICYDIR}/policy/policy.%{POLICYVER}
 		/usr/sbin/load_policy $POLICYFILE
 	 	fixfiles -C %{FILE_CONTEXT}.pre restore
 	fi
@@ -217,7 +214,7 @@
 exit 0
 
 %changelog
-* Tue Jul 12 2005 Dan Walsh <dwalsh at redhat.com> 1.17.30-3.18
+* Tue Jul 12 2005 Dan Walsh <dwalsh at redhat.com> 1.17.30-3.19
 - Allow nscd to use tun_tap device
 - Add winbind_helper
 - Allow apache to work with ldap


