- skip configure.in chunk for version bump

[packages/lighttpd.git] / lighttpd.spec

diff --git a/lighttpd.spec b/lighttpd.spec
index 989097d195572fca4cc0293067897be2964781fd..5eade02c6336fa9477485dad07c472d000de8dfd 100644 (file)
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -37,16 +37,16 @@
 %define                webdav_progs    1
 %endif
 
-%define                _rel 7
+%define                _rel 2
 Summary:       Fast and light HTTP server
 Summary(pl.UTF-8):     Szybki i lekki serwer HTTP
 Name:          lighttpd
-Version:       1.4.18
+Version:       1.4.19
 Release:       %{_rel}%{?_snap:.%(echo %{_snap}|tr - _)}%{?_svn:.%{_svn}}
 License:       BSD
 Group:         Networking/Daemons
 Source0:       http://www.lighttpd.net/download/%{name}-%{version}.tar.bz2
-# Source0-md5: 26f98dddf9d8c0775221b800986003ee
+# Source0-md5: d787374e4e4aaa09d5cfa9ab9d23ad40
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.user
@@ -99,11 +99,12 @@ Source132:  %{name}-ssl.conf
 Source133:     %{name}-mod_mysql_vhost.conf
 Source134:     %{name}-mod_magnet.conf
 Source135:     %{name}-mod_extforward.conf
-Source136:     lighttpd-mod_h264_streaming.conf
-Patch100:      %{name}-branch.diff
+Source136:     %{name}-mod_h264_streaming.conf
+#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
 #Patchx:       %{name}-mod_deflate.patch
 URL:           http://www.lighttpd.net/
 %{?with_xattr:BuildRequires:   attr-devel}
@@ -137,9 +138,9 @@ Requires(pre):      /usr/lib/rpm/user_group.sh
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires(pre): /usr/sbin/usermod
-Requires:      %{name}-mod_dirlisting
-Requires:      %{name}-mod_indexfile
-Requires:      %{name}-mod_staticfile
+Requires:      %{name}-mod_dirlisting = %{version}-%{release}
+Requires:      %{name}-mod_indexfile = %{version}-%{release}
+Requires:      %{name}-mod_staticfile = %{version}-%{release}
 Requires:      rc-scripts
 Requires:      webapps
 Provides:      group(http)
@@ -698,6 +699,7 @@ zaimplementowane. Jak na razie są:
 - DELETE
 - PUT
 - LOCK (experimental)
+
 oraz zwykłe GET, POST, HEAD z HTTP/1.1.
 
 Jak na razie montowanie zasobu webdav pod Windows XP działa i
@@ -773,10 +775,11 @@ Plik monitrc do monitorowania serwera www lighttpd.
 
 %prep
 %setup -q
-%patch100 -p0
+#%patch100 -p0
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # build mime.types.conf
 sh %{SOURCE6} /etc/mime.types
@@ -851,7 +854,7 @@ install %{SOURCE108} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_dirlisting.conf
 install %{SOURCE109} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_evasive.conf
 install %{SOURCE110} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_evhost.conf
 install %{SOURCE111} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_expire.conf
-install %{SOURCE135} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_extforward.conf
+install %{SOURCE135} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/91_mod_extforward.conf
 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
@@ -1004,11 +1007,11 @@ fi
 %module_scripts php-spawned
 %module_scripts php-external
 
-%triggerpostun -- %{name} <= 1.3.6-2
-%banner %{name} -e <<EOF
-spawn-fcgi program is now available separately from spawn-fcgi package.
-
-EOF
+%triggerpostun -- %{name} < 1.4.18-10.1
+if [ -f /etc/lighttpd/conf.d/50_mod_extforward.conf.rpmsave ]; then
+       cp -f /etc/lighttpd/conf.d/91_mod_extforward.conf{,.rpmnew}
+       mv -f /etc/lighttpd/conf.d/{50_mod_extforward.conf.rpmsave,91_mod_extforward.conf}
+fi
 
 %files
 %defattr(644,root,root,755)
@@ -1028,7 +1031,8 @@ EOF
 %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/*
-%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_sbindir}/lighttpd
+%attr(755,root,root) %{_sbindir}/lighttpd-angel
 %dir %{_libdir}
 %{_mandir}/man?/*
 %dir %{_lighttpddir}