up to 1.4.45

[packages/lighttpd.git] / lighttpd.spec

diff --git a/lighttpd.spec b/lighttpd.spec
index 85eda8c9c3ca39efd22463bf68cf0edbcb00c67a..d00f5fe686aaf3ab6363fbfcba2c31c7f80d8d33 100644 (file)
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -38,12 +38,12 @@
 Summary:       Fast and light HTTP server
 Summary(pl.UTF-8):     Szybki i lekki serwer HTTP
 Name:          lighttpd
-Version:       1.4.43
-Release:       0.4
+Version:       1.4.45
+Release:       1
 License:       BSD
 Group:         Networking/Daemons/HTTP
 Source0:       http://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.xz
-# Source0-md5: 95eda531c27b161ef8fa2b9bf4948caf
+# Source0-md5: a128e1eda76899ce3fd115efae5fe631
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.user
@@ -63,7 +63,6 @@ Source12:     %{name}.monitrc
 Source13:      branch.sh
 Source14:      TODO
 Source16:      %{name}.tmpfiles
-Source17:      %{name}.service
 Source100:     %{name}-mod_access.conf
 Source101:     %{name}-mod_accesslog.conf
 Source102:     %{name}-mod_alias.conf
@@ -112,6 +111,7 @@ Patch0:             %{name}-use_bin_sh.patch
 Patch1:                %{name}-mod_evasive-status_code.patch
 Patch2:                %{name}-mod_h264_streaming.patch
 Patch3:                %{name}-branding.patch
+Patch4:                systemd.patch
 Patch6:                test-port-setup.patch
 Patch7:                env-documentroot.patch
 URL:           http://www.lighttpd.net/
@@ -912,6 +912,7 @@ Plik monitrc do monitorowania serwera www lighttpd.
 #%patch1 -p1 UPDATE (and submit upstream!) if you need this
 %{?with_h264_streaming:%patch2 -p1}
 %patch3 -p1
+%patch4 -p1
 %patch6 -p1
 #%patch7 -p1 probably fixed upstream
 
@@ -933,9 +934,9 @@ if [ "$ver" != "%{version}" ]; then
        exit 1
 fi
 
+%{__aclocal} -I scripts/m4
 %{__libtoolize}
 %{__autoheader}
-%{__aclocal}
 %{__autoconf}
 %{__automake}
 
@@ -984,7 +985,7 @@ cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 cp -p %{SOURCE12} $RPM_BUILD_ROOT/etc/monit/%{name}.monitrc
 cp -p %{SOURCE16} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
-cp -p %{SOURCE17} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
+cp -p doc/systemd/lighttpd.service $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
 
 rm -f $RPM_BUILD_ROOT%{pkglibdir}/*.la
 
@@ -1215,6 +1216,7 @@ fi
 %attr(755,root,root) %{_sbindir}/lighttpd-angel
 %dir %{pkglibdir}
 %{_mandir}/man8/lighttpd.8*
+%{_mandir}/man8/lighttpd-angel.8*
 %dir %{_lighttpddir}
 %dir %{_lighttpddir}/cgi-bin
 %dir %{_lighttpddir}/html