use existing solutions to set branding

[packages/lighttpd.git] / lighttpd.spec

diff --git a/lighttpd.spec b/lighttpd.spec
index 929cca1a78d622c1f1a81876ced26bd706703c5d..53abd59b6352c11b1503186d315a7bcd34b32d97 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.46
+Release:       0.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: b774558e0c07f9eae91105c4132383cb
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.user
@@ -63,48 +63,48 @@ 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
-Source103:     %{name}-mod_auth.conf
-Source104:     %{name}-mod_cgi.conf
-Source105:     %{name}-mod_cml.conf
-Source106:     %{name}-mod_compress.conf
-Source107:     %{name}-mod_deflate.conf
-Source108:     %{name}-mod_dirlisting.conf
-Source109:     %{name}-mod_evasive.conf
-Source110:     %{name}-mod_evhost.conf
-Source111:     %{name}-mod_expire.conf
-Source112:     %{name}-mod_fastcgi.conf
-Source113:     %{name}-mod_flv_streaming.conf
-Source114:     %{name}-mod_indexfile.conf
-Source115:     %{name}-mod_proxy.conf
-Source116:     %{name}-mod_redirect.conf
-Source117:     %{name}-mod_rewrite.conf
-Source118:     %{name}-mod_rrdtool.conf
-Source119:     %{name}-mod_scgi.conf
-Source120:     %{name}-mod_secdownload.conf
-Source121:     %{name}-mod_setenv.conf
-Source122:     %{name}-mod_simple_vhost.conf
-Source123:     %{name}-mod_ssi.conf
-Source124:     %{name}-mod_staticfile.conf
-Source125:     %{name}-mod_status.conf
-Source126:     %{name}-mod_trigger_b4_dl.conf
-Source127:     %{name}-mod_userdir.conf
-Source128:     %{name}-mod_usertrack.conf
-Source129:     %{name}-mod_webdav.conf
-Source130:     %{name}-php-spawned.conf
-Source131:     %{name}-php-external.conf
-Source132:     %{name}-ssl.conf
-Source133:     %{name}-mod_mysql_vhost.conf
-Source134:     %{name}-mod_magnet.conf
-Source135:     %{name}-mod_extforward.conf
-Source136:     %{name}-mod_h264_streaming.conf
-Source137:     %{name}-mod_cgi_php.conf
-Source138:     %{name}-mod_compress.tmpwatch
-Source139:     %{name}-mod_uploadprogress.conf
-Source140:     %{name}-mod_geoip.conf
+Source100:     mod_access.conf
+Source101:     mod_accesslog.conf
+Source102:     mod_alias.conf
+Source103:     mod_auth.conf
+Source104:     mod_cgi.conf
+Source105:     mod_cml.conf
+Source106:     mod_compress.conf
+Source107:     mod_deflate.conf
+Source108:     mod_dirlisting.conf
+Source109:     mod_evasive.conf
+Source110:     mod_evhost.conf
+Source111:     mod_expire.conf
+Source112:     mod_fastcgi.conf
+Source113:     mod_flv_streaming.conf
+Source114:     mod_indexfile.conf
+Source115:     mod_proxy.conf
+Source116:     mod_redirect.conf
+Source117:     mod_rewrite.conf
+Source118:     mod_rrdtool.conf
+Source119:     mod_scgi.conf
+Source120:     mod_secdownload.conf
+Source121:     mod_setenv.conf
+Source122:     mod_simple_vhost.conf
+Source123:     mod_ssi.conf
+Source124:     mod_staticfile.conf
+Source125:     mod_status.conf
+Source126:     mod_trigger_b4_dl.conf
+Source127:     mod_userdir.conf
+Source128:     mod_usertrack.conf
+Source129:     mod_webdav.conf
+Source130:     php-spawned.conf
+Source131:     php-external.conf
+Source132:     ssl.conf
+Source133:     mod_mysql_vhost.conf
+Source134:     mod_magnet.conf
+Source135:     mod_extforward.conf
+Source136:     mod_h264_streaming.conf
+Source137:     mod_cgi_php.conf
+Source138:     mod_compress.tmpwatch
+Source139:     mod_uploadprogress.conf
+Source140:     mod_geoip.conf
+Source141:     mod_authn_ldap.conf
 # use branch.sh script to create branch.diff
 #Patch100:     %{name}-branch.diff
 ## Patch100-md5:       7bd09235304c8bcb16f34d49d480c0fb
@@ -112,6 +112,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 +913,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,10 +935,10 @@ if [ "$ver" != "%{version}" ]; then
        exit 1
 fi
 
+%{__aclocal} -I m4 -I scripts/m4
 %{__libtoolize}
-%{__autoheader}
-%{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 
 %configure \
@@ -984,7 +986,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
 
@@ -1018,6 +1020,9 @@ cp -p %{SOURCE113} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_flv_streaming.con
 %if %{with geoip}
 cp -p %{SOURCE140} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_geoip.conf
 %endif
+%if %{with ldap}
+cp -p %{SOURCE141} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_authn_ldap.conf
+%endif
 %if %{with h264_streaming}
 cp -p %{SOURCE136} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_h264_streaming.conf
 %endif
@@ -1264,6 +1269,7 @@ fi
 
 %files mod_authn_ldap
 %defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_authn_ldap.conf
 %attr(755,root,root) %{pkglibdir}/mod_authn_ldap.so
 
 %if %{with mysql}