- rename branch.sh script

[packages/lighttpd.git] / lighttpd.spec

diff --git a/lighttpd.spec b/lighttpd.spec
index aae1c0a885e7782da63c83b313f27ee20a32ae18..bf9fa24436bed97f5252cb556ee21237e142ae40 100644 (file)
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -22,12 +22,12 @@
 Summary:       Fast and light HTTP server
 Summary(pl.UTF-8):     Szybki i lekki serwer HTTP
 Name:          lighttpd
-Version:       1.4.23
-Release:       4
+Version:       1.4.26
+Release:       6
 License:       BSD
 Group:         Networking/Daemons/HTTP
-Source0:       http://www.lighttpd.net/download/%{name}-%{version}.tar.bz2
-# Source0-md5: 0ab6bb7b17bf0f515ce7dce68e5e215a
+Source0:       http://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.bz2
+# Source0-md5: a682c8efce47a2f4263a247ba0813c9b
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.user
@@ -36,15 +36,16 @@ Source5:    %{name}.sysconfig
 Source6:       %{name}-mime.types.sh
 Source7:       http://glen.alkohol.ee/pld/lighty/favicon.ico
 # Source7-md5: 00fcac5b861a54f5eb147a589504d480
-Source8:       http://www.lighttpd.net/light_button.png
-# Source8-md5: 02330e2313fadc29144edfd6000879f8
-Source9:       http://www.lighttpd.net/light_logo.png
-# Source9-md5: ac20784510e420d5cbe5fc1cdb53d7a7
-Source10:      http://gdl.hopto.org/~spider/pldstats/gfx/pld1.png
-# Source10-md5:        486ecec3f6f4fe7f9bf7cee757b864f4
+Source8:       light_button.png
+# Source8-md5: 3e1008ee1d3d6d390cf81fe3072b4f50
+Source9:       light_logo.png
+# Source9-md5: cbb7f0676e51ee2e26cf004df293fc62
+Source10:      pld_button.png
+# Source10-md5:        185afa921e81bd726b9f0f9f0909dc6e
 Source11:      %{name}-pld.html
 Source12:      %{name}.monitrc
-Source13:      %{name}-branch.sh
+Source13:      branch.sh
+Source14:      TODO
 Source100:     %{name}-mod_access.conf
 Source101:     %{name}-mod_accesslog.conf
 Source102:     %{name}-mod_alias.conf
@@ -90,10 +91,11 @@ Patch2:             %{name}-mod_h264_streaming.patch
 Patch3:                %{name}-branding.patch
 Patch4:                %{name}-modinit-before-fork.patch
 Patch5:                %{name}-mod_deflate.patch
+Patch6:                etag-32bit-overflow.patch
 #Patch8:               %{name}-errorlog-before-fork.patch
 URL:           http://www.lighttpd.net/
 %{?with_xattr:BuildRequires:   attr-devel}
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.57
 BuildRequires: automake
 BuildRequires: bzip2-devel
 BuildRequires: fcgi-devel
@@ -113,6 +115,7 @@ BuildRequires:      pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.268
 %{?with_webdav_props:BuildRequires:    sqlite3-devel}
 %{?with_valgrind:BuildRequires:        valgrind}
+BuildRequires: which
 BuildRequires: zlib-devel
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
@@ -126,12 +129,13 @@ Requires(pre):    /usr/sbin/usermod
 Requires:      %{name}-mod_dirlisting = %{version}-%{release}
 Requires:      %{name}-mod_indexfile = %{version}-%{release}
 Requires:      %{name}-mod_staticfile = %{version}-%{release}
-Requires:      rc-scripts
+Requires:      rc-scripts >= 0.4.1.26-2
 Requires:      rpm-whiteout >= 1.5
 Provides:      group(http)
 Provides:      group(lighttpd)
 Provides:      user(lighttpd)
 Provides:      webserver
+Provides:      webserver(mime)
 Conflicts:     logrotate < 3.7-4
 # for the posttrans scriptlet, conflicts because in vserver environment rpm package is not installed.
 Conflicts:     rpm < 4.4.2-0.2
@@ -339,6 +343,7 @@ kontrolą CSS.
 Summary:       lighttpd evasive module
 Summary(pl.UTF-8):     Moduł evasive dla lighttpd
 Group:         Networking/Daemons/HTTP
+URL:           http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModEvasive
 Requires:      %{name} = %{version}-%{release}
 
 %description mod_evasive
@@ -416,7 +421,7 @@ jak Perl, PHP czy własne aplikacje.
 Summary:       lighttpd module for flv streaming
 Summary(pl.UTF-8):     Moduł lighttpd do streamingu flv
 Group:         Networking/Daemons/HTTP
-URL:           http://blog.lighttpd.net/articles/2006/03/09/flv-streaming-with-lighttpd
+URL:           http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModFLVStreaming
 Requires:      %{name} = %{version}-%{release}
 
 %description mod_flv_streaming
@@ -443,6 +448,7 @@ Moduł lighttpd do pseudostreamingu plików QuickTime/MPEG-4.
 Summary:       lighttpd indexfile module
 Summary(pl.UTF-8):     Moduł indexfile dla lighttpd
 Group:         Networking/Daemons/HTTP
+URL:           http://redmine.lighttpd.net/projects/lighttpd/wiki/Index-file-names.Details
 Requires:      %{name} = %{version}-%{release}
 Provides:      webserver(indexfile)
 
@@ -456,6 +462,7 @@ Moduł indexfile.
 Summary:       lighttpd powermagnet module
 Summary(pl.UTF-8):     Moduł powermagnet dla lighttpd
 Group:         Networking/Daemons/HTTP
+URL:           http://redmine.lighttpd.net/wiki/lighttpd/Docs:ModMagnet
 Requires:      %{name} = %{version}-%{release}
 
 %description mod_magnet
@@ -780,7 +787,9 @@ Obsługa PHP przez FastCGI, uruchamianie sterowane zewnętrznie.
 Summary:       lighttpd support for SSLv2 and SSLv3
 Summary(pl.UTF-8):     Obsługa SSLv2 i SSLv3 dla lighttpd
 Group:         Networking/Daemons/HTTP
+URL:           http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:SSL
 Requires:      %{name} = %{version}-%{release}
+Suggests:      ca-certificates
 
 %description ssl
 lighttpd support for SSLv2 and SSLv3.
@@ -810,13 +819,21 @@ Plik monitrc do monitorowania serwera www lighttpd.
 %patch2 -p1
 %patch3 -p1
 %{?with_deflate:%patch5 -p1}
+%patch6 -p1
 
 rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead
 
 # build mime.types.conf
 sh %{SOURCE6} /etc/mime.types
+cp -a %{SOURCE14} PLD-TODO
 
 %build
+ver=$(awk '/AC_INIT/{a=$2;gsub(/[\[\],]/, "", a); print a}' configure.ac)
+if [ "$ver" != "%{version}" ]; then
+       : configure.ac specifies wrong version
+       exit 1
+fi
+
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -845,7 +862,7 @@ sh %{SOURCE6} /etc/mime.types
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_lighttpddir}/{cgi-bin,html},/etc/{logrotate.d,rc.d/init.d,sysconfig,monit}} \
-       $RPM_BUILD_ROOT%{_sysconfdir}/{conf,webapps}.d \
+       $RPM_BUILD_ROOT%{_sysconfdir}/{conf,vhosts,webapps}.d \
        $RPM_BUILD_ROOT{/var/log/{%{name},archive/%{name}},/var/run/%{name}} \
        $RPM_BUILD_ROOT%{_datadir}/lighttpd/errordocs \
        $RPM_BUILD_ROOT/var/lib/lighttpd \
@@ -888,7 +905,6 @@ install %{SOURCE112} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_fastcgi.conf
 install %{SOURCE113} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_flv_streaming.conf
 install %{SOURCE136} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_h264_streaming.conf
 install %{SOURCE114} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_indexfile.conf
-install %{SOURCE134} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_magnet.conf
 install %{SOURCE115} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_proxy.conf
 install %{SOURCE118} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_rrdtool.conf
 install %{SOURCE119} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_scgi.conf
@@ -904,6 +920,7 @@ install %{SOURCE128} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_usertrack.conf
 install %{SOURCE129} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_webdav.conf
 install %{SOURCE133} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_mysql_vhost.conf
 
+install %{SOURCE134} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/55_mod_magnet.conf
 install %{SOURCE111} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/55_mod_expire.conf
 
 install %{SOURCE106} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/60_mod_compress.conf
@@ -1049,10 +1066,11 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc NEWS README ChangeLog doc/lighttpd.conf doc/*.txt doc/rrdtool-graph.sh
+%doc NEWS README doc/lighttpd.conf doc/*.txt doc/rrdtool-graph.sh PLD-TODO
 %dir %attr(751,root,lighttpd) %{_sysconfdir}
-%dir %attr(750,root,root) %{_sysconfdir}/webapps.d
 %dir %attr(750,root,root) %{_sysconfdir}/conf.d
+%dir %attr(750,root,root) %{_sysconfdir}/vhosts.d
+%dir %attr(750,root,root) %{_sysconfdir}/webapps.d
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mime.types.conf
 %attr(640,root,lighttpd) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.user
@@ -1060,9 +1078,9 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
 %attr(750,root,root) %dir /var/log/archive/%{name}
 %dir %attr(751,root,root) /var/log/%{name}
-%ghost %attr(644,lighttpd,lighttpd) /var/log/%{name}/access.log
-%ghost %attr(644,lighttpd,lighttpd) /var/log/%{name}/error.log
-%ghost %attr(644,lighttpd,lighttpd) /var/log/%{name}/breakage.log
+%attr(644,lighttpd,lighttpd) %ghost /var/log/%{name}/access.log
+%attr(644,lighttpd,lighttpd) %ghost /var/log/%{name}/error.log
+%attr(644,lighttpd,lighttpd) %ghost /var/log/%{name}/breakage.log
 %dir %attr(770,root,lighttpd) /var/run/%{name}
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/*
@@ -1073,7 +1091,9 @@ fi
 %dir %{_lighttpddir}
 %dir %{_lighttpddir}/cgi-bin
 %dir %{_lighttpddir}/html
-%config(noreplace,missingok) %verify(not md5 mtime size) %{_lighttpddir}/html/*
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_lighttpddir}/html/index.html
+%config(missingok) %verify(not md5 mtime size) %{_lighttpddir}/html/*.png
+%config(missingok) %verify(not md5 mtime size) %{_lighttpddir}/html/*.ico
 
 %dir %{_datadir}/lighttpd
 %dir %{_datadir}/lighttpd/errordocs
@@ -1207,7 +1227,7 @@ fi
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_rrdtool.conf
 %attr(755,root,root) %{_libdir}/mod_rrdtool.so
-%ghost %attr(640,lighttpd,stats) /var/lib/lighttpd/lighttpd.rrd
+%attr(640,lighttpd,stats) %ghost /var/lib/lighttpd/lighttpd.rrd
 
 %files mod_scgi
 %defattr(644,root,root,755)