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

[fedora-cvs-commits redhat com]

Author: dwalsh

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

Modified Files:
	selinux-policy-targeted.spec 
Log Message:
* Tue Jul 12 2005 Dan Walsh <dwalsh redhat com> 1.17.30-3.18
- 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.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- selinux-policy-targeted.spec	12 Jul 2005 12:04:18 -0000	1.219
+++ selinux-policy-targeted.spec	12 Jul 2005 19:06:00 -0000	1.220
@@ -2,13 +2,12 @@
 %define POLICYVER 18
 %define POLICYDIR /etc/selinux/%{type}
 %define FILE_CONTEXT %{POLICYDIR}/contexts/files/file_contexts
-%define POLICYVER 18
 %define POLICYCOREUTILSVER 1.18.1-2.8
 %define CHECKPOLICYVER 1.17.5-1.2
 Summary: SELinux %{type} policy configuration
 Name: selinux-policy-%{type}
 Version: 1.17.30
-Release: 3.17
+Release: 3.18
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz
@@ -146,7 +145,11 @@
 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
-		/usr/sbin/load_policy %{POLICYDIR}/policy/policy.`cat /selinux/policyvers`
+		POLICYFILE=%{POLICYDIR}/policy/policy.`cat /selinux/policyvers`
+		if [ ! -f $POLICYFILE ]; then
+			POLICYFILE=%{POLICYDIR}/policy/policy.%{POLICYVER}
+		endif
+		/usr/sbin/load_policy $POLICYFILE
 	 	fixfiles -C %{FILE_CONTEXT}.pre restore
 	fi
 fi
@@ -214,10 +217,11 @@
 exit 0
 
 %changelog
-* Tue Jul 12 2005 Dan Walsh <dwalsh redhat com> 1.17.30-3.17
+* Tue Jul 12 2005 Dan Walsh <dwalsh redhat com> 1.17.30-3.18
 - Allow nscd to use tun_tap device
 - Add winbind_helper
 - Allow apache to work with ldap
+- Fix load_policy line in spec file
 
 * Wed Jun 29 2005 Dan Walsh <dwalsh redhat com> 1.17.30-3.16
 - Allow unconfined_t to execmod file_type