rpms/lighttpd/EL-4 lighttpd.spec,1.12,1.13

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/lighttpd/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27618/EL-4

Modified Files:
	lighttpd.spec 
Log Message:
Split out spawn-fcgi package.



Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-4/lighttpd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- lighttpd.spec	24 Dec 2008 17:35:30 -0000	1.12
+++ lighttpd.spec	25 Dec 2008 17:11:03 -0000	1.13
@@ -6,7 +6,7 @@
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
 Version: 1.4.20
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -64,6 +64,8 @@
 Summary: FastCGI module and spawning helper for lighttpd and PHP configuration
 Group: System Environment/Daemons
 Requires: %{name} = %{version}-%{release}
+# Not really a requirement, but it used to be included (until 1.4.20-5)
+Requires: spawn-fcgi
 
 %description fastcgi
 This package contains the spawn-fcgi helper for lighttpd's automatic spawning
@@ -91,10 +93,20 @@
 Virtual host module for lighttpd that uses a MySQL database.
 
 
+%package -n spawn-fcgi
+Summary: Simple program for spawning FastCGI processes
+Group: System Environment/Daemons
+
+%description -n spawn-fcgi
+This package contains the spawn-fcgi program used for spawning FastCGI
+processes, which can be local or remote.
+
+
 %prep
 %setup -q
 %patch0 -p1 -b .defaultconf
 %patch1 -p1 -b .mod_geoip
+%patch2 -p1 -b .initinfo
 %{__install} -p -m 0644 %{SOURCE100} src/mod_geoip.c
 %{__install} -p -m 0644 %{SOURCE101} mod_geoip.txt
 
@@ -156,14 +168,6 @@
 # Install empty run directory to include (for the example fastcgi socket)
 %{__mkdir_p} %{buildroot}%{_var}/run/lighttpd
 
-# Rename spawn-fastcgi, prefix to avoid clash with other packages
-%{__mv} %{buildroot}%{_bindir}/spawn-fcgi \
-        %{buildroot}%{_bindir}/lighttpd-spawn-fcgi
-%{__mv} %{buildroot}%{_mandir}/man1/spawn-fcgi.1 \
-        %{buildroot}%{_mandir}/man1/lighttpd-spawn-fcgi.1
-# But still provide a compatibility symlink for now
-%{__ln_s} lighttpd-spawn-fcgi %{buildroot}%{_bindir}/spawn-fcgi
-
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -218,11 +222,8 @@
 %defattr(-,root,root,-)
 %doc doc/fastcgi*.txt
 %config(noreplace) %{_sysconfdir}/php.d/lighttpd.ini
-%{_bindir}/lighttpd-spawn-fcgi
-%{_bindir}/spawn-fcgi
 %dir %{_libdir}/lighttpd/
 %{_libdir}/lighttpd/mod_fastcgi.so
-%{_mandir}/man1/lighttpd-spawn-fcgi.1*
 
 %files mod_geoip
 %defattr(-,root,root,-)
@@ -236,12 +237,17 @@
 %dir %{_libdir}/lighttpd/
 %{_libdir}/lighttpd/mod_mysql_vhost.so
 
+%files -n spawn-fcgi
+%{_bindir}/spawn-fcgi
+%{_mandir}/man1/spawn-fcgi.1*
 
 %changelog
-* Wed Dec 24 2008 Matthias Saou <http://freshrpms.net/> 1.4.20-5
+* Wed Dec 24 2008 Matthias Saou <http://freshrpms.net/> 1.4.20-6
 - Partially revert last change by creating a "spawn-fastcgi" symlink, so that
   nothing breaks currently (especially for EL).
 - Install empty poweredby image on RHEL since the symlink's target is missing.
+- Split spawn-fcgi off in its own sub-package, have fastcgi package require it
+  to provide backwards compatibility.
 
 * Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 1.4.20-3
 - Rename spawn-fastcgi to lighttpd-spawn-fastcgi to avoid clash with other