rpms/mod_fcgid/devel mod_fcgid.spec,1.11,1.12

[Paul Howarth (pghmcfc)]

Author: pghmcfc

Update of /cvs/pkgs/rpms/mod_fcgid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3895

Modified Files:
	mod_fcgid.spec 
Log Message:
* Thu Jul 24 2008 Paul Howarth <paul at city-fan.org> 2.2-5
- Tweak selinux-policy version detection macro to work with current Rawhide



Index: mod_fcgid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/devel/mod_fcgid.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mod_fcgid.spec	14 Feb 2008 14:45:39 -0000	1.11
+++ mod_fcgid.spec	24 Jul 2008 16:04:55 -0000	1.12
@@ -11,7 +11,7 @@
 
 Name:		mod_fcgid
 Version:	2.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Apache2 module for high-performance server-side scripting 
 Group:		System Environment/Daemons
 License:	GPL+
@@ -37,7 +37,7 @@
 as possible.
 
 %if %{selinux_module}
-%define selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp)
+%global selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp || echo 0.0.0)
 %define selinux_policynum %(echo %{selinux_policyver} | %{__awk} -F. '{ printf "%d%02d%02d", $1, $2, $3 }')
 %package selinux
 Summary:	  SELinux policy module supporting FastCGI applications with mod_fcgid
@@ -49,9 +49,7 @@
 # http://www.redhat.com/archives/fedora-selinux-list/2006-May/msg00102.html
 # Hence the versioned dependency. The versioning will hopefully be replaced by
 # an ABI version requirement or something similar in the future
-%if "%{selinux_policyver}" != ""
 Requires:	  selinux-policy >= %{selinux_policyver}
-%endif
 Requires:	  %{name} = %{version}-%{release}
 Requires(post):	  /usr/sbin/semodule, /sbin/restorecon
 Requires(postun): /usr/sbin/semodule, /sbin/restorecon
@@ -157,6 +155,9 @@
 %endif
 
 %changelog
+* Thu Jul 24 2008 Paul Howarth <paul at city-fan.org> 2.2-5
+- Tweak selinux-policy version detection macro to work with current Rawhide
+
 * Thu Feb 14 2008 Paul Howarth <paul at city-fan.org> 2.2-4
 - Rebuild with gcc 4.3.0 for Fedora 9