- fix build with older automake

[packages/lighttpd.git] / lighttpd.spec

diff --git a/lighttpd.spec b/lighttpd.spec
index c2114295176a05f0f47cd2f5790bbd6fd4297d22..d59498b0d27e925d47fa50002ec02b4f7842b3ab 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:       6
+Version:       1.4.25
+Release:       2
 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: 2027c49fb46530e45338c5e2da13c02f
 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
+Source14:      TODO
 Source100:     %{name}-mod_access.conf
 Source101:     %{name}-mod_accesslog.conf
 Source102:     %{name}-mod_alias.conf
@@ -83,17 +84,18 @@ Source134:  %{name}-mod_magnet.conf
 Source135:     %{name}-mod_extforward.conf
 Source136:     %{name}-mod_h264_streaming.conf
 Source137:     %{name}-mod_cgi_php.conf
-Patch100:      %{name}-branch.diff
+#Patch100:     %{name}-branch.diff
 Patch0:                %{name}-use_bin_sh.patch
 Patch1:                %{name}-mod_evasive-status_code.patch
 Patch2:                %{name}-mod_h264_streaming.patch
 Patch3:                %{name}-branding.patch
 Patch4:                %{name}-modinit-before-fork.patch
 Patch5:                %{name}-mod_deflate.patch
+Patch6:                am-old.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
@@ -132,6 +134,7 @@ 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
@@ -808,20 +811,28 @@ Plik monitrc do monitorowania serwera www lighttpd.
 
 %prep
 %setup -q
-%patch100 -p0
+#%patch100 -p0
 %patch4 -p0
 %patch0 -p1
 %patch1 -p1
 %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}
@@ -1054,7 +1065,7 @@ 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
@@ -1078,7 +1089,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