rpms/mod_fcgid/F-9 mod_fcgid.spec,1.12,1.13

[Paul Howarth]

Author: pghmcfc

Update of /cvs/pkgs/rpms/mod_fcgid/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv545

Modified Files:
	mod_fcgid.spec 
Log Message:
- SELinux policy module no longer built for Fedora 8 onwards as it is
  obsoleted by the main selinux-policy package
- Conflicts for selinux-policy packages older than the releases where mod_fcgid
  policy was incorporated have been added for Fedora 8, 9, and 10 versions, to
  ensure that SELinux support will work if installed



Index: mod_fcgid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_fcgid/F-9/mod_fcgid.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_fcgid.spec	24 Oct 2008 14:42:58 -0000	1.12
+++ mod_fcgid.spec	12 Nov 2008 12:20:58 -0000	1.13
@@ -1,11 +1,12 @@
 # Fedora 5,6,7 and EPEL5 versions includes SELinux policy module package
-# Fedora 8,9,10 versions will include policy in errata selinux-policy releases
-%if 0%{?fedora}%{?rhel} < 5
+# Fedora 8 and 9 versions include policy in errata selinux-policy releases
+# Fedora 10 onwards include policy in standard selinux-policy releases
+%if 0%{?fedora}%{?rhel} < 5 || 0%{?fedora} > 7 || 0%{?rhel} > 5
 %global selinux_module 0
+%global selinux_types %{nil}
 %global selinux_variants %{nil}
 %global selinux_buildreqs %{nil}
 %else
-# Temporarily build merged policy to make sure it works
 %global selinux_module 1
 %global selinux_types %(%{__awk} '/^#[[:space:]]*SELINUXTYPE=/,/^[^#]/ { if ($3 == "-") printf "%s ", $2 }' /etc/selinux/config 2>/dev/null)
 %global selinux_variants %([ -z "%{selinux_types}" ] && echo mls strict targeted || echo %{selinux_types})
@@ -14,7 +15,7 @@
 
 Name:		mod_fcgid
 Version:	2.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Apache2 module for high-performance server-side scripting 
 Group:		System Environment/Daemons
 License:	GPL+
@@ -32,6 +33,16 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gawk, httpd-devel >= 2.0, pkgconfig
 Requires:	httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && %{__cat} %{_includedir}/httpd/.mmn || echo missing)
+# Make sure that selinux-policy is sufficiently up-to-date if it's installed
+%if "%{?fedora}" == "8"
+Conflicts:	selinux-policy < 3.0.8-123.fc8
+%endif
+%if "%{?fedora}" == "9"
+Conflicts:	selinux-policy < 3.3.1-107.fc9
+%endif
+%if "%{?fedora}" == "10"
+Conflicts:	selinux-policy < 3.5.13-8.fc10
+%endif
 
 %description
 mod_fcgid is a binary-compatible alternative to the Apache module mod_fastcgi.
@@ -158,6 +169,13 @@
 %endif
 
 %changelog
+* Wed Nov 12 2008 Paul Howarth <paul at city-fan.org> 2.2-7
+- SELinux policy module no longer built for Fedora 8 onwards as it is
+  obsoleted by the main selinux-policy package
+- Conflicts for selinux-policy packages older than the releases where mod_fcgid
+  policy was incorporated have been added for Fedora 8, 9, and 10 versions, to
+  ensure that SELinux support will work if installed
+
 * Tue Oct 21 2008 Paul Howarth <paul at city-fan.org> 2.2-6
 - SELinux policy module rewritten to merge fastcgi and system script domains
   in preparation for merge into main selinux-policy package (#462318)