rpms/lighttpd/F-8 lighttpd-empty.png, NONE, 1.1 lighttpd.spec, 1.44, 1.45
Matthias Saou
thias at fedoraproject.org
Fri Dec 26 11:11:48 UTC 2008
Author: thias
Update of /cvs/extras/rpms/lighttpd/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11387/F-8
Modified Files:
lighttpd.spec
Added Files:
lighttpd-empty.png
Log Message:
Backport spawn-fcgi package split from devel to F-10, F-9 and F-8.
Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/F-8/lighttpd.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- lighttpd.spec 24 Dec 2008 16:58:07 -0000 1.44
+++ lighttpd.spec 26 Dec 2008 11:11:18 -0000 1.45
@@ -1,9 +1,12 @@
%define webroot /var/www/lighttpd
+# LUA support requires >= 5.1 but EPEL4 provides only 5.0, so disable
+%{?el4: %define _without_lua 1}
+
Summary: Lightning fast webserver with light system requirements
Name: lighttpd
Version: 1.4.20
-Release: 4%{?dist}
+Release: 6%{?dist}
License: BSD
Group: System Environment/Daemons
URL: http://www.lighttpd.net/
@@ -14,13 +17,17 @@
Source11: http://www.lighttpd.net/favicon.ico
Source12: http://www.lighttpd.net/light_button.png
Source13: http://www.lighttpd.net/light_logo.png
+Source14: lighttpd-empty.png
Source100: lighttpd-mod_geoip.c
Source101: lighttpd-mod_geoip.txt
Patch0: lighttpd-1.4.20-defaultconf.patch
Patch1: lighttpd-1.4.18-mod_geoip.patch
Patch2: lighttpd-1.4.20-initinfo.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+# For the target poweredby.png image (skip requirement + provide image on RHEL)
+%if 0%{!?rhel:1}
Requires: system-logos >= 7.92.1
+%endif
Requires(pre): /usr/sbin/useradd
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/service, /sbin/chkconfig
@@ -36,7 +43,7 @@
%if %{!?fedora:0}%{?fedora} <= 6
BuildRequires: readline-devel
%endif
-%if 0%{?el} <= 6
+%if 0%{?rhel} <= 6
BuildRequires: readline-devel
%endif
@@ -57,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
@@ -84,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
@@ -135,8 +154,12 @@
%{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
%{buildroot}%{webroot}/
-# Symlink for the powered-by-$DISTRO image
+# Symlink for the powered-by-$DISTRO image (install empty image on RHEL)
+%if 0%{!?rhel:1}
%{__ln_s} %{_datadir}/pixmaps/poweredby.png \
+%else
+%{__install} -p -m 0644 %{SOURCE14} \
+%endif
%{buildroot}%{webroot}/poweredby.png
# Install empty log directory to include
@@ -145,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}
@@ -207,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,-)
@@ -225,11 +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-4
+* 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
More information about the fedora-extras-commits
mailing list