SPECS (DEVEL): lighttpd.spec - remoev duplicate monitrc packaging - move fc...

glen glen at pld-linux.org
Mon Jan 19 12:04:41 CET 2009


Author: glen                         Date: Mon Jan 19 11:04:41 2009 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- remoev duplicate monitrc packaging
- move fcgi-stat-accell to proxy fcgi backend package
- adjust Groups: like on HEAD
- strict internal deps from HEAD

---- Files affected:
SPECS:
   lighttpd.spec (1.201.2.18 -> 1.201.2.19) 

---- Diffs:

================================================================
Index: SPECS/lighttpd.spec
diff -u SPECS/lighttpd.spec:1.201.2.18 SPECS/lighttpd.spec:1.201.2.19
--- SPECS/lighttpd.spec:1.201.2.18	Mon Jan 19 11:58:00 2009
+++ SPECS/lighttpd.spec	Mon Jan 19 12:04:35 2009
@@ -48,14 +48,14 @@
 %define		webdav_progs	1
 %endif
 
-%define		rel 0.5
+%define		rel 0.6
 Summary:	Fast and light HTTP server
 Summary(pl.UTF-8):	Szybki i lekki serwer HTTP
 Name:		lighttpd
 Version:	1.5.0
 Release:	%{rel}%{?snap:.%(echo %{snap}|tr - _)}%{?svn:.%{svn}}
 License:	BSD
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Source0:	%{name}-%{version}.tar.gz
 # Source0-md5:	e9396859e2b2f9be7291b5636ae4195a
 Source1:	%{name}.init
@@ -74,6 +74,7 @@
 # Source10-md5:	486ecec3f6f4fe7f9bf7cee757b864f4
 Source11:	%{name}-pld.html
 Source12:	%{name}.monitrc
+Source13:	%{name}-branch.sh
 Source100:	%{name}-mod_access.conf
 Source101:	%{name}-mod_accesslog.conf
 Source102:	%{name}-mod_alias.conf
@@ -151,11 +152,12 @@
 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:	libaio
 Requires:	rc-scripts
+Requires:	rpm-whiteout >= 1.5
 Requires:	webapps
 Provides:	group(http)
 Provides:	group(lighttpd)
@@ -192,7 +194,7 @@
 %package mod_access
 Summary:	lighttpd module for making access restrictions
 Summary(pl.UTF-8):	Moduł lighttpd ograniczający dostęp
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 Provides:	webserver(access)
 
@@ -207,7 +209,7 @@
 %package mod_accesslog
 Summary:	lighttpd module to record access logs
 Summary(pl.UTF-8):	Moduł lighttpd do zapisu logów dostępu
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 
 %description mod_accesslog
@@ -219,7 +221,7 @@
 %package mod_alias
 Summary:	lighttpd module for making URL aliasing
 Summary(pl.UTF-8):	Moduł lighttpd odpowiadający za aliasy URL-i
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 Provides:	webserver(alias)
 
@@ -234,7 +236,7 @@
 %package mod_auth
 Summary:	lighttpd module for authentication support
 Summary(pl.UTF-8):	Moduł lighttpd do obsługi uwierzytelniania
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 Provides:	webserver(auth)
 
@@ -249,7 +251,7 @@
 %package mod_cgi
 Summary:	lighttpd module for CGI handling
 Summary(pl.UTF-8):	Moduł lighttpd do obsługi CGI
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-mod_alias = %{version}-%{release}
 Provides:	webserver(cgi)
@@ -269,7 +271,7 @@
 %package mod_cml
 Summary:	lighttpd module for Cache Meta Language
 Summary(pl.UTF-8):	Moduł Cache Meta Language
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 
 %description mod_cml
@@ -284,7 +286,7 @@
 %package mod_compress
 Summary:	lighttpd module for output compression
 Summary(pl.UTF-8):	Moduł lighttpd do kompresji wyjścia
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 
 %description mod_compress
@@ -308,7 +310,7 @@
 %package mod_deflate
 Summary:	lighttpd module for output compression using deflate method
 Summary(pl.UTF-8):	Moduł lighttpd do kompresji wyjścia metodą deflate
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://trac.lighttpd.net/trac/wiki/Mod_Deflate
 Requires:	%{name} = %{version}-%{release}
 
@@ -324,7 +326,7 @@
 %package mod_dirlisting
 Summary:	lighttpd module for directory listings
 Summary(pl.UTF-8):	Moduł lighttpd do tworzenia listingów katalogów
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 
 %description mod_dirlisting
@@ -338,7 +340,7 @@
 %package mod_evasive
 Summary:	lighttpd evasive module
 Summary(pl.UTF-8):	Moduł evasive dla lighttpd
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 
 %description mod_evasive
@@ -350,7 +352,7 @@
 %package mod_evhost
 Summary:	lighttpd module for enhanced virtual-hosting
 Summary(pl.UTF-8):	Moduł lighttpd rozszerzający obsługę hostów wirtualnych
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 
 %description mod_evhost
@@ -366,7 +368,7 @@
 %package mod_expire
 Summary:	lighttpd module for controlling the expiration of content in caches
 Summary(pl.UTF-8):	Moduł lighttpd sterujący wygasaniem treści w cache'ach
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 
 %description mod_expire
@@ -378,7 +380,7 @@
 %package mod_extforward
 Summary:	lighttpd module to extract the client's "real" IP from X-Forwarded-For header
 Summary(pl.UTF-8):	Moduł lighttpd wyciągający "prawdziwy" IP klienta z nagłówka X-Forwarded-For
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 
 %description mod_extforward
@@ -394,7 +396,7 @@
 %package mod_flv_streaming
 Summary:	lighttpd module for flv streaming
 Summary(pl.UTF-8):	Moduł lighttpd do streamingu flv
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 
 %description mod_flv_streaming
@@ -406,7 +408,7 @@
 %package mod_indexfile
 Summary:	lighttpd indexfile module
 Summary(pl.UTF-8):	Moduł indexfile dla lighttpd
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 Provides:	webserver(indexfile)
 
@@ -419,7 +421,7 @@
 %package mod_magnet
 Summary:	lighttpd powermagnet module
 Summary(pl.UTF-8):	Moduł powermagnet dla lighttpd
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 
 %description mod_magnet
@@ -431,7 +433,7 @@
 %package mod_mysql_vhost
 Summary:	lighttpd module for MySQL based vhosting
 Summary(pl.UTF-8):	Moduł lighttpd obsługujący vhosty oparte na MySQL-u
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 Conflicts:	%{name}-mod_simple_vhost
 
@@ -444,7 +446,7 @@
 %package mod_proxy
 Summary:	lighttpd module for proxying requests
 Summary(pl.UTF-8):	Moduł lighttpd do przekazywania żądań
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name}-mod_proxy_core = %{version}-%{release}
 
 %description mod_proxy
@@ -453,7 +455,7 @@
 %package mod_proxy_core
 Summary:	lighttpd module for proxying requests
 Summary(pl.UTF-8):	Moduł lighttpd do przekazywania żądań
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://trac.lighttpd.net/trac/wiki/Docs:ModProxyCore
 Requires:	%{name} = %{version}-%{release}
 
@@ -471,7 +473,7 @@
 
 %package mod_proxy_backend_ajp13
 Summary:	lighttpd proxy backend for ajp13 protocol
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name}-mod_proxy_core = %{version}-%{release}
 
 %description mod_proxy_backend_ajp13
@@ -479,7 +481,7 @@
 
 %package mod_proxy_backend_fastcgi
 Summary:	lighttpd proxy backend for FastCGI protocol
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name}-mod_proxy_core = %{version}-%{release}
 Obsoletes:	lighttpd-mod_fastcgi < 1.5.0
 
@@ -499,7 +501,7 @@
 
 %package mod_proxy_backend_http
 Summary:	lighttpd proxy backend for HTTP protocol
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name}-mod_proxy_core = %{version}-%{release}
 
 %description mod_proxy_backend_http
@@ -507,7 +509,7 @@
 
 %package mod_proxy_backend_scgi
 Summary:	lighttpd proxy backend for SCGI protocol
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name}-mod_proxy_core = %{version}-%{release}
 Obsoletes:	lighttpd-mod_scgi < 1.5.0
 
@@ -526,7 +528,7 @@
 %package mod_redirect
 Summary:	lighttpd module for URL redirects
 Summary(pl.UTF-8):	Moduł lighttpd do przekierowań URL-i
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 
 %description mod_redirect
@@ -539,7 +541,7 @@
 %package mod_rewrite
 Summary:	lighttpd module for internal redirects, URL rewrite
 Summary(pl.UTF-8):	Moduł lighttpd do wewnętrznych przekierowań i przepisywania URL-i
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 
 %description mod_rewrite
@@ -553,7 +555,7 @@
 %package mod_rrdtool
 Summary:	lighttpd module for monitoring traffic and server load
 Summary(pl.UTF-8):	Moduł lighttpd do monitorowania ruchu i obciążenia serwera
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 Requires:	rrdtool
 
@@ -575,7 +577,7 @@
 %package mod_secdownload
 Summary:	lighttpd module for secure and fast downloading
 Summary(pl.UTF-8):	Moduł lighttpd do bezpiecznego i szybkiego ściągania danych
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 
 %description mod_secdownload
@@ -589,7 +591,7 @@
 %package mod_setenv
 Summary:	lighttpd module for setting conditional request headers
 Summary(pl.UTF-8):	Moduł lighttpd do ustawiania warunkowych nagłówków żądań
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 
 %description mod_setenv
@@ -601,7 +603,7 @@
 %package mod_simple_vhost
 Summary:	lighttpd module for simple virtual-hosting
 Summary(pl.UTF-8):	Moduł lighttpd do prostych hostów wirtualnych
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 Conflicts:	%{name}-mod_mysql_vhost
 
@@ -614,7 +616,7 @@
 %package mod_ssi
 Summary:	lighttpd module for server-side includes
 Summary(pl.UTF-8):	Moduł lighttpd do SSI (server-side includes)
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 
 %description mod_ssi
@@ -628,7 +630,7 @@
 %package mod_staticfile
 Summary:	lighttpd module for static file serving
 Summary(pl.UTF-8):	Moduł lighttpd do serwowania statycznych plików
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 
 %description mod_staticfile
@@ -640,7 +642,7 @@
 %package mod_status
 Summary:	lighttpd module for displaying server status
 Summary(pl.UTF-8):	Moduł lighttpd do wyświetlania stanu serwera
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 
 %description mod_status
@@ -652,7 +654,7 @@
 %package mod_trigger_b4_dl
 Summary:	Trigger before Download
 Summary(pl.UTF-8):	Wyzwalacz przed ściąganiem
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 
 %description mod_trigger_b4_dl
@@ -663,7 +665,7 @@
 
 %package mod_uploadprogress
 Summary:	lighttpd module for upload progress
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 
 %description mod_uploadprogress
@@ -672,7 +674,7 @@
 %package mod_userdir
 Summary:	lighttpd module for user homedirs
 Summary(pl.UTF-8):	Moduł lighttpd obsługujący katalogi domowe użytkowników
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 
 %description mod_userdir
@@ -686,7 +688,7 @@
 %package mod_usertrack
 Summary:	lighttpd usertrack module
 Summary(pl.UTF-8):	Moduł usertrack dla lighttpd
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 
 %description mod_usertrack
@@ -698,7 +700,7 @@
 %package mod_webdav
 Summary:	WebDAV module for lighttpd
 Summary(pl.UTF-8):	Moduł WebDAV dla libghttpd
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 
 %description mod_webdav
@@ -750,7 +752,7 @@
 %package php-spawned
 Summary:	PHP support via FastCGI, spawned by lighttpd
 Summary(pl.UTF-8):	Obsługa PHP przez FastCGI, uruchamiane przez lighttpd
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-mod_proxy_backend_fastcgi = %{version}-%{release}
 Requires:	php-fcgi
@@ -765,7 +767,7 @@
 %package php-external
 Summary:	PHP support via FastCGI, spawning controlled externally
 Summary(pl.UTF-8):	Obsługa PHP przez FastCGI, uruchamianie sterowane zewnętrznie
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-mod_proxy_backend_fastcgi = %{version}-%{release}
 Requires:	php-fcgi-init
@@ -780,7 +782,7 @@
 %package ssl
 Summary:	lighttpd support for SSLv2 and SSLv3
 Summary(pl.UTF-8):	Obsługa SSLv2 i SSLv3 dla lighttpd
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name} = %{version}-%{release}
 
 %description ssl
@@ -1056,7 +1058,6 @@
 %attr(640,root,lighttpd) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.user
 
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/monit/%{name}.monitrc
 %attr(750,root,root) %dir /var/log/archive/%{name}
 %dir %attr(751,root,root) /var/log/%{name}
 %ghost %attr(644,lighttpd,lighttpd) /var/log/%{name}/access.log
@@ -1064,7 +1065,7 @@
 %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
 %dir %{_libdir}
 %attr(755,root,root) %{_libdir}/mod_chunked.so
 %{_mandir}/man?/*
@@ -1195,6 +1196,7 @@
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_proxy_backend_fastcgi.conf
 %attr(755,root,root) %{_libdir}/mod_proxy_backend_fastcgi.so
+%attr(755,root,root) %{_sbindir}/fcgi-stat-accel
 
 %files mod_proxy_backend_http
 %defattr(644,root,root,755)
@@ -1304,6 +1306,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.201.2.19  2009/01/19 11:04:35  glen
+- remoev duplicate monitrc packaging
+- move fcgi-stat-accell to proxy fcgi backend package
+- adjust Groups: like on HEAD
+- strict internal deps from HEAD
+
 Revision 1.201.2.18  2009/01/19 10:58:00  glen
 - configs for proxy ajp13 and http backends
 - mod_proxy is now virtual for smooth upgrade
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/lighttpd.spec?r1=1.201.2.18&r2=1.201.2.19&f=u



More information about the pld-cvs-commit mailing list