X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=lighttpd.spec;h=3cfc32f9e6e55871e3c3d6fbe364d9097b8f3de9;hb=ee84413;hp=1ad200527fd72ebead74ad2b32cf7d1716829b81;hpb=9aac48ebab319f6f61aac441cf96d46b2165b8f0;p=packages%2Flighttpd.git

diff --git a/lighttpd.spec b/lighttpd.spec
index 1ad2005..3cfc32f 100644
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -30,7 +30,7 @@ Summary:	Fast and light HTTP server
 Summary(pl.UTF-8):	Szybki i lekki serwer HTTP
 Name:		lighttpd
 Version:	1.4.42
-Release:	0.1
+Release:	0.2
 License:	BSD
 Group:		Networking/Daemons/HTTP
 Source0:	http://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.xz
@@ -94,6 +94,8 @@ 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
 # use branch.sh script to create branch.diff
 #Patch100:	%{name}-branch.diff
 ## Patch100-md5:	7bd09235304c8bcb16f34d49d480c0fb
@@ -237,6 +239,7 @@ Summary(pl.UTF-8):	Moduł lighttpd do obsługi uwierzytelniania
 Group:		Networking/Daemons/HTTP
 URL:		http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModAuth
 Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-mod_authn_file = %{version}-%{release}
 Provides:	webserver(auth)
 
 %description mod_auth
@@ -491,7 +494,12 @@ URL:		https://redmine.lighttpd.net/projects/lighttpd/wiki/Docs_ModGeoip
 Requires:	%{name} = %{version}-%{release}
 
 %description mod_geoip
-lighttpd module for IP Based Geographic Lookups.
+mod_geoip is a module for fast ip/location lookups. It uses MaxMind
+GeoIP / GeoCity databases.
+
+If the ip was found in the database the module sets the appropriate
+environment variables to the request, thus making other modules/fcgi
+be informed.
 
 %package mod_h264_streaming
 Summary:	lighttpd module for h264 streaming
@@ -990,6 +998,7 @@ cp -p %{SOURCE109} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_evasive.conf
 cp -p %{SOURCE110} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_evhost.conf
 cp -p %{SOURCE112} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_fastcgi.conf
 cp -p %{SOURCE113} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_flv_streaming.conf
+cp -p %{SOURCE140} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_geoip.conf
 %if %{with h264_streaming}
 cp -p %{SOURCE136} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_h264_streaming.conf
 %endif
@@ -1004,6 +1013,7 @@ cp -p %{SOURCE123} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_ssi.conf
 cp -p %{SOURCE124} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_staticfile.conf
 cp -p %{SOURCE125} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_status.conf
 cp -p %{SOURCE126} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_trigger_b4_dl.conf
+cp -p %{SOURCE139} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_uploadprogress.conf
 cp -p %{SOURCE127} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_userdir.conf
 cp -p %{SOURCE128} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_usertrack.conf
 cp -p %{SOURCE129} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_webdav.conf
@@ -1303,6 +1313,7 @@ fi
 
 %files mod_geoip
 %defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_geoip.conf
 %attr(755,root,root) %{_libexecdir}/mod_geoip.so
 
 %if %{with h264_streaming}
@@ -1392,6 +1403,7 @@ fi
 
 %files mod_uploadprogress
 %defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_uploadprogress.conf
 %attr(755,root,root) %{_libexecdir}/mod_uploadprogress.so
 
 %files mod_userdir