packages (DEVEL): lighttpd/lighttpd.spec - HEAD merge, up to r1.353
glen
glen at pld-linux.org
Thu Jan 5 19:09:46 CET 2012
Author: glen Date: Thu Jan 5 18:09:46 2012 GMT
Module: packages Tag: DEVEL
---- Log message:
- HEAD merge, up to r1.353
---- Files affected:
packages/lighttpd:
lighttpd.spec (1.201.2.23 -> 1.201.2.24)
---- Diffs:
================================================================
Index: packages/lighttpd/lighttpd.spec
diff -u packages/lighttpd/lighttpd.spec:1.201.2.23 packages/lighttpd/lighttpd.spec:1.201.2.24
--- packages/lighttpd/lighttpd.spec:1.201.2.23 Thu Jan 5 18:59:23 2012
+++ packages/lighttpd/lighttpd.spec Thu Jan 5 19:09:41 2012
@@ -66,17 +66,17 @@
Source4: %{name}.logrotate
Source5: %{name}.sysconfig
Source6: %{name}-mime.types.sh
-Source7: http://www.lighttpd.net/favicon.ico
-# Source7-md5: a358994becabd4060393a5454bde505d
-Source8: http://www.lighttpd.net/light_button.png
-# Source8-md5: 02330e2313fadc29144edfd6000879f8
-Source9: http://www.lighttpd.net/light_logo.png
-# Source9-md5: ac20784510e420d5cbe5fc1cdb53d7a7
-Source10: http://gdl.hopto.org/~spider/pldstats/gfx/pld1.png
-# Source10-md5: 486ecec3f6f4fe7f9bf7cee757b864f4
+Source7: http://glen.alkohol.ee/pld/lighty/favicon.ico
+# Source7-md5: 00fcac5b861a54f5eb147a589504d480
+Source8: light_button.png
+# Source8-md5: 3e1008ee1d3d6d390cf81fe3072b4f50
+Source9: light_logo.png
+# Source9-md5: cbb7f0676e51ee2e26cf004df293fc62
+Source10: pld_button.png
+# Source10-md5: 185afa921e81bd726b9f0f9f0909dc6e
Source11: %{name}-pld.html
Source12: %{name}.monitrc
-Source13: %{name}-branch.sh
+Source13: branch.sh
Source100: %{name}-mod_access.conf
Source101: %{name}-mod_accesslog.conf
Source102: %{name}-mod_alias.conf
@@ -137,13 +137,14 @@
%{?with_lua:BuildRequires: lua51-devel}
BuildRequires: mailcap >= 2.1.14-4.4
%{?with_mysql:BuildRequires: mysql-devel}
-%{?with_ldap:BuildRequires: openldap-devel >= 2.4.6}
+%{?with_ldap:BuildRequires: openldap-devel}
%{?with_ssl:BuildRequires: openssl-devel}
BuildRequires: pcre-devel
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.268
%{?with_webdav_props:BuildRequires: sqlite3-devel}
%{?with_valgrind:BuildRequires: valgrind}
+BuildRequires: which
BuildRequires: zlib-devel
Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
@@ -165,6 +166,7 @@
Provides: group(lighttpd)
Provides: user(lighttpd)
Provides: webserver
+Provides: webserver(mime)
Conflicts: logrotate < 3.7-4
# for the posttrans scriptlet, conflicts because in vserver environment rpm package is not installed.
Conflicts: rpm < 4.4.2-0.2
@@ -197,6 +199,7 @@
Summary: lighttpd module for making access restrictions
Summary(pl.UTF-8): Moduł lighttpd ograniczający dostęp
Group: Networking/Daemons/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModAccess
Requires: %{name} = %{version}-%{release}
Provides: webserver(access)
@@ -212,6 +215,7 @@
Summary: lighttpd module to record access logs
Summary(pl.UTF-8): Moduł lighttpd do zapisu logów dostępu
Group: Networking/Daemons/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModAccessLog
Requires: %{name} = %{version}-%{release}
%description mod_accesslog
@@ -224,6 +228,7 @@
Summary: lighttpd module for making URL aliasing
Summary(pl.UTF-8): Moduł lighttpd odpowiadający za aliasy URL-i
Group: Networking/Daemons/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModAlias
Requires: %{name} = %{version}-%{release}
Provides: webserver(alias)
@@ -239,6 +244,7 @@
Summary: lighttpd module for authentication support
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}
Provides: webserver(auth)
@@ -254,6 +260,7 @@
Summary: lighttpd module for CGI handling
Summary(pl.UTF-8): Moduł lighttpd do obsługi CGI
Group: Networking/Daemons/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModCGI
Requires: %{name} = %{version}-%{release}
Requires: %{name}-mod_alias = %{version}-%{release}
Provides: webserver(cgi)
@@ -274,6 +281,7 @@
Summary: lighttpd module for Cache Meta Language
Summary(pl.UTF-8): Moduł Cache Meta Language
Group: Networking/Daemons/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModCML
Requires: %{name} = %{version}-%{release}
%description mod_cml
@@ -289,6 +297,7 @@
Summary: lighttpd module for output compression
Summary(pl.UTF-8): Moduł lighttpd do kompresji wyjścia
Group: Networking/Daemons/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModCompress
Requires: %{name} = %{version}-%{release}
%description mod_compress
@@ -313,7 +322,7 @@
Summary: lighttpd module for output compression using deflate method
Summary(pl.UTF-8): Moduł lighttpd do kompresji wyjścia metodą deflate
Group: Networking/Daemons/HTTP
-URL: http://trac.lighttpd.net/trac/wiki/Mod_Deflate
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Mod_Deflate
Requires: %{name} = %{version}-%{release}
%description mod_deflate
@@ -329,6 +338,7 @@
Summary: lighttpd module for directory listings
Summary(pl.UTF-8): Moduł lighttpd do tworzenia listingów katalogów
Group: Networking/Daemons/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModDirlisting
Requires: %{name} = %{version}-%{release}
%description mod_dirlisting
@@ -343,6 +353,7 @@
Summary: lighttpd evasive module
Summary(pl.UTF-8): Moduł evasive dla lighttpd
Group: Networking/Daemons/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModEvasive
Requires: %{name} = %{version}-%{release}
%description mod_evasive
@@ -355,6 +366,7 @@
Summary: lighttpd module for enhanced virtual-hosting
Summary(pl.UTF-8): Moduł lighttpd rozszerzający obsługę hostów wirtualnych
Group: Networking/Daemons/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModEVhost
Requires: %{name} = %{version}-%{release}
%description mod_evhost
@@ -371,7 +383,9 @@
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/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModExpire
Requires: %{name} = %{version}-%{release}
+Provides: webserver(expires)
%description mod_expire
mod_expire controls the setting of the the Expire response header.
@@ -383,6 +397,7 @@
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/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/DocsModExtForward
Requires: %{name} = %{version}-%{release}
%description mod_extforward
@@ -399,6 +414,7 @@
Summary: lighttpd module for flv streaming
Summary(pl.UTF-8): Moduł lighttpd do streamingu flv
Group: Networking/Daemons/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModFLVStreaming
Requires: %{name} = %{version}-%{release}
%description mod_flv_streaming
@@ -411,6 +427,7 @@
Summary: lighttpd indexfile module
Summary(pl.UTF-8): Moduł indexfile dla lighttpd
Group: Networking/Daemons/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Index-file-names.Details
Requires: %{name} = %{version}-%{release}
Provides: webserver(indexfile)
@@ -424,6 +441,7 @@
Summary: lighttpd powermagnet module
Summary(pl.UTF-8): Moduł powermagnet dla lighttpd
Group: Networking/Daemons/HTTP
+URL: http://redmine.lighttpd.net/wiki/lighttpd/Docs:ModMagnet
Requires: %{name} = %{version}-%{release}
%description mod_magnet
@@ -436,6 +454,7 @@
Summary: lighttpd module for MySQL based vhosting
Summary(pl.UTF-8): Moduł lighttpd obsługujący vhosty oparte na MySQL-u
Group: Networking/Daemons/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModMySQLVhost
Requires: %{name} = %{version}-%{release}
Conflicts: %{name}-mod_simple_vhost
@@ -532,6 +551,7 @@
Summary: lighttpd module for URL redirects
Summary(pl.UTF-8): Moduł lighttpd do przekierowań URL-i
Group: Networking/Daemons/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModRedirect
Requires: %{name} = %{version}-%{release}
%description mod_redirect
@@ -545,7 +565,9 @@
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/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModRewrite
Requires: %{name} = %{version}-%{release}
+Provides: webserver(rewrite)
%description mod_rewrite
This module allows you rewrite a set of URLs interally in the
@@ -559,6 +581,7 @@
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/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModRRDTool
Requires: %{name} = %{version}-%{release}
Requires: rrdtool
@@ -581,6 +604,7 @@
Summary: lighttpd module for secure and fast downloading
Summary(pl.UTF-8): Moduł lighttpd do bezpiecznego i szybkiego ściągania danych
Group: Networking/Daemons/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModSecDownload
Requires: %{name} = %{version}-%{release}
%description mod_secdownload
@@ -595,7 +619,9 @@
Summary: lighttpd module for setting conditional request headers
Summary(pl.UTF-8): Moduł lighttpd do ustawiania warunkowych nagłówków żądań
Group: Networking/Daemons/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModSetEnv
Requires: %{name} = %{version}-%{release}
+Provides: webserver(setenv)
%description mod_setenv
mod_setenv is used to add request headers.
@@ -607,6 +633,7 @@
Summary: lighttpd module for simple virtual-hosting
Summary(pl.UTF-8): Moduł lighttpd do prostych hostów wirtualnych
Group: Networking/Daemons/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModSimpleVhost
Requires: %{name} = %{version}-%{release}
Conflicts: %{name}-mod_mysql_vhost
@@ -620,6 +647,7 @@
Summary: lighttpd module for server-side includes
Summary(pl.UTF-8): Moduł lighttpd do SSI (server-side includes)
Group: Networking/Daemons/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModSSI
Requires: %{name} = %{version}-%{release}
%description mod_ssi
@@ -646,6 +674,7 @@
Summary: lighttpd module for displaying server status
Summary(pl.UTF-8): Moduł lighttpd do wyświetlania stanu serwera
Group: Networking/Daemons/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModStatus
Requires: %{name} = %{version}-%{release}
%description mod_status
@@ -658,6 +687,7 @@
Summary: Trigger before Download
Summary(pl.UTF-8): Wyzwalacz przed ściąganiem
Group: Networking/Daemons/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModTriggerBeforeDownload
Requires: %{name} = %{version}-%{release}
%description mod_trigger_b4_dl
@@ -678,6 +708,7 @@
Summary: lighttpd module for user homedirs
Summary(pl.UTF-8): Moduł lighttpd obsługujący katalogi domowe użytkowników
Group: Networking/Daemons/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModUserDir
Requires: %{name} = %{version}-%{release}
%description mod_userdir
@@ -692,6 +723,7 @@
Summary: lighttpd usertrack module
Summary(pl.UTF-8): Moduł usertrack dla lighttpd
Group: Networking/Daemons/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModUserTrack
Requires: %{name} = %{version}-%{release}
%description mod_usertrack
@@ -704,6 +736,7 @@
Summary: WebDAV module for lighttpd
Summary(pl.UTF-8): Moduł WebDAV dla libghttpd
Group: Networking/Daemons/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModWebDAV
Requires: %{name} = %{version}-%{release}
%description mod_webdav
@@ -739,19 +772,6 @@
Jak na razie montowanie zasobu webdav pod Windows XP działa i
podstawowe testy lakmusowe przechodzą.
-%package -n spawn-fcgi
-Summary: Spawn fcgi-process directly
-Summary(pl.UTF-8): Bezpośrednie uruchamianie procesów fcgi
-Group: Applications
-
-%description -n spawn-fcgi
-spawn-fcgi is used to spawn fcgi-process directly without the help of
-a webserver or the programm itself.
-
-%description -n spawn-fcgi -l pl.UTF-8
-spawn-fcgi służy do uruchamiania procesów fcgi bezpośrednio, bez
-pomocy serwera WWW ani samego programu.
-
%package php-spawned
Summary: PHP support via FastCGI, spawned by lighttpd
Summary(pl.UTF-8): Obsługa PHP przez FastCGI, uruchamiane przez lighttpd
@@ -786,7 +806,9 @@
Summary: lighttpd support for SSLv2 and SSLv3
Summary(pl.UTF-8): Obsługa SSLv2 i SSLv3 dla lighttpd
Group: Networking/Daemons/HTTP
+URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:SSL
Requires: %{name} = %{version}-%{release}
+Suggests: ca-certificates
%description ssl
lighttpd support for SSLv2 and SSLv3.
@@ -863,79 +885,76 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install %{SOURCE2} %{SOURCE3} mime.types.conf $RPM_BUILD_ROOT%{_sysconfdir}
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
-install %{SOURCE12} $RPM_BUILD_ROOT/etc/monit/%{name}.monitrc
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+cp -p %{SOURCE2} %{SOURCE3} mime.types.conf $RPM_BUILD_ROOT%{_sysconfdir}
+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
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-# could use automake patch, but automake generation fails...
-mv $RPM_BUILD_ROOT%{_bindir}/spawn-fcgi $RPM_BUILD_ROOT%{_sbindir}/spawn-fcgi
-
# Install lighttpd images
-install %{SOURCE7} %{SOURCE8} %{SOURCE9} $RPM_BUILD_ROOT%{_lighttpddir}/html
-install %{SOURCE10} $RPM_BUILD_ROOT%{_lighttpddir}/html/pld_button.png
-install %{SOURCE11} $RPM_BUILD_ROOT%{_lighttpddir}/html/index.html
+cp -p %{SOURCE7} %{SOURCE8} %{SOURCE9} $RPM_BUILD_ROOT%{_lighttpddir}/html
+cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_lighttpddir}/html/pld_button.png
+cp -p %{SOURCE11} $RPM_BUILD_ROOT%{_lighttpddir}/html/index.html
# NOTE: the order of the modules is somewhat important as the modules are
# handled in the way they are specified. mod_rewrite should always be the first
# module, mod_accesslog always the last.
-install %{SOURCE117} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/10_mod_rewrite.conf
-install %{SOURCE116} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/11_mod_redirect.conf
+cp -p %{SOURCE117} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/10_mod_rewrite.conf
+cp -p %{SOURCE116} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/11_mod_redirect.conf
-install %{SOURCE100} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_access.conf
-install %{SOURCE102} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_alias.conf
-install %{SOURCE103} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_auth.conf
-install %{SOURCE104} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_cgi.conf
-install %{SOURCE105} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_cml.conf
-install %{SOURCE106} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_compress.conf
-install %{SOURCE107} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_deflate.conf
-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 %{SOURCE113} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_flv_streaming.conf
-install %{SOURCE114} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_indexfile.conf
-install %{SOURCE134} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_magnet.conf
-install %{SOURCE118} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_rrdtool.conf
-install %{SOURCE137} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_proxy_core.conf
-install %{SOURCE138} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/55_mod_proxy_backend_fastcgi.conf
-install %{SOURCE139} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/55_mod_proxy_backend_ajp13.conf
-install %{SOURCE140} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/55_mod_proxy_backend_http.conf
-install %{SOURCE119} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/55_mod_proxy_backend_scgi.conf
-install %{SOURCE120} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_secdownload.conf
-install %{SOURCE121} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_setenv.conf
-install %{SOURCE122} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_simple_vhost.conf
-install %{SOURCE123} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_ssi.conf
-install %{SOURCE124} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_staticfile.conf
-install %{SOURCE125} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_status.conf
-install %{SOURCE126} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_trigger_b4_dl.conf
-install %{SOURCE136} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_uploadprogress.conf
-install %{SOURCE127} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_userdir.conf
-install %{SOURCE128} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_usertrack.conf
-install %{SOURCE129} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_webdav.conf
-install %{SOURCE133} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_mysql_vhost.conf
-
-install %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_accesslog.conf
-
-install %{SOURCE130} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/php-spawned.conf
-install %{SOURCE131} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/php-external.conf
-install %{SOURCE132} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/ssl.conf
+cp -p %{SOURCE100} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_access.conf
+cp -p %{SOURCE102} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_alias.conf
+cp -p %{SOURCE103} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_auth.conf
+cp -p %{SOURCE104} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_cgi.conf
+cp -p %{SOURCE105} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_cml.conf
+cp -p %{SOURCE106} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_compress.conf
+cp -p %{SOURCE107} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_deflate.conf
+cp -p %{SOURCE108} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_dirlisting.conf
+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 %{SOURCE111} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_expire.conf
+cp -p %{SOURCE135} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_extforward.conf
+cp -p %{SOURCE113} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_flv_streaming.conf
+cp -p %{SOURCE114} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_indexfile.conf
+cp -p %{SOURCE134} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_magnet.conf
+cp -p %{SOURCE118} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_rrdtool.conf
+cp -p %{SOURCE137} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_proxy_core.conf
+cp -p %{SOURCE138} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/55_mod_proxy_backend_fastcgi.conf
+cp -p %{SOURCE139} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/55_mod_proxy_backend_ajp13.conf
+cp -p %{SOURCE140} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/55_mod_proxy_backend_http.conf
+cp -p %{SOURCE119} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/55_mod_proxy_backend_scgi.conf
+cp -p %{SOURCE120} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_secdownload.conf
+cp -p %{SOURCE121} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_setenv.conf
+cp -p %{SOURCE122} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_simple_vhost.conf
+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 %{SOURCE136} $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
+cp -p %{SOURCE133} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_mysql_vhost.conf
+
+cp -p %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_accesslog.conf
+
+cp -p %{SOURCE130} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/php-spawned.conf
+cp -p %{SOURCE131} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/php-external.conf
+cp -p %{SOURCE132} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/ssl.conf
touch $RPM_BUILD_ROOT/var/lib/lighttpd/lighttpd.rrd
%if %{without mysql}
# avoid packaging dummy module
-rm -f $RPM_BUILD_ROOT%{_libdir}/mod_mysql_vhost.so
-rm -f $RPM_BUILD_ROOT%{_libdir}/mod_sql_vhost_core.so
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/*_mod_mysql_vhost.conf
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/mod_mysql_vhost.so
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/mod_sql_vhost_core.so
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/*_mod_mysql_vhost.conf
%endif
%if %{without deflate}
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/*_mod_deflate.conf
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/*_mod_deflate.conf
%endif
touch $RPM_BUILD_ROOT/var/log/%{name}/{access,error}.log
@@ -946,7 +965,7 @@
%pre
%groupadd -g 109 lighttpd
%groupadd -g 51 http
-%useradd -u 116 -d %{_lighttpddir} -c "LigHTTPd User" -g lighttpd lighttpd
+%useradd -u 116 -d %{_lighttpddir} -c "Lighttpd User" -g lighttpd lighttpd
%addusertogroup lighttpd http
%post
@@ -977,11 +996,11 @@
#
# 1. at the end of transaction. (posttrans, feature from rpm 4.4.2)
# 2. first install of module (post: $1 = 1)
-# 2. uninstall of module (postun: $1 == 0)
+# 2. uninstall of module (postun: $1 = 0)
#
# the strict internal deps between lighttpd modules and
# main package are very important for all this to work.
-%service %{name} restart "LigHTTPd webserver"
+%service %{name} restart "Lighttpd webserver"
exit 0
# macro called at module post scriptlet
@@ -1053,12 +1072,6 @@
%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
-
%files
%defattr(644,root,root,755)
%doc NEWS README ChangeLog doc/lighttpd.conf doc/*.txt doc/rrdtool-graph.sh doc/convert-1.5.sh
@@ -1291,11 +1304,6 @@
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_webdav.conf
%attr(755,root,root) %{_libdir}/mod_webdav.so
-%files -n spawn-fcgi
-%defattr(644,root,root,755)
-%doc doc/spawn-php.sh
-%attr(755,root,root) %{_sbindir}/spawn-fcgi
-
%files php-spawned
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/php-spawned.conf
@@ -1318,6 +1326,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.201.2.24 2012/01/05 18:09:41 glen
+- HEAD merge, up to r1.353
+
Revision 1.201.2.23 2012/01/05 17:59:23 glen
- revert wrong commit
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lighttpd/lighttpd.spec?r1=1.201.2.23&r2=1.201.2.24&f=u
More information about the pld-cvs-commit
mailing list