Author: jajcus Date: Wed Apr 7 12:31:32 2010 GMT Module: packages Tag: HEAD ---- Log message: - Version: 0.99.44 - use find_lang to package localisation
---- Files affected: packages/cherokee: cherokee-config.patch (1.5 -> 1.6) , cherokee.spec (1.24 -> 1.25) ---- Diffs: ================================================================ Index: packages/cherokee/cherokee-config.patch diff -u packages/cherokee/cherokee-config.patch:1.5 packages/cherokee/cherokee-config.patch:1.6 --- packages/cherokee/cherokee-config.patch:1.5 Sat Nov 28 02:15:44 2009 +++ packages/cherokee/cherokee-config.patch Wed Apr 7 14:31:26 2010 @@ -1,5 +1,5 @@ ---- cherokee-0.99.29/cherokee.conf.sample.pre.orig 2009-11-15 16:24:35.000000000 +0100 -+++ cherokee-0.99.29/cherokee.conf.sample.pre 2009-11-28 02:04:28.000000000 +0100 +--- cherokee-0.99.44/cherokee.conf.sample.pre.orig 2010-03-20 14:41:48.000000000 +0100 ++++ cherokee-0.99.44/cherokee.conf.sample.pre 2010-04-07 13:56:15.000000000 +0200 @@ -11,6 +11,8 @@ # Server @@ -9,16 +9,17 @@ server!bind!1!port = 80 server!timeout = 15 server!keepalive = 1 -@@ -27,10 +29,10 @@ +@@ -27,11 +29,11 @@ vserver!1!logger = combined vserver!1!logger!access!type = file -vserver!1!logger!access!filename = %localstatedir%/log/cherokee.access +vserver!1!logger!access!filename = %localstatedir%/log/cherokee/cherokee.access vserver!1!logger!access!buffsize = 16384 - vserver!1!logger!error!type = file --vserver!1!logger!error!filename = %localstatedir%/log/cherokee.error -+vserver!1!logger!error!filename = %localstatedir%/log/cherokee/cherokee.error + + vserver!1!error_writer!type = file +-vserver!1!error_writer!filename = %localstatedir%/log/cherokee.error ++vserver!1!error_writer!filename = %localstatedir%/log/cherokee/cherokee.error vserver!1!rule!1!match = default vserver!1!rule!1!handler = common ================================================================ Index: packages/cherokee/cherokee.spec diff -u packages/cherokee/cherokee.spec:1.24 packages/cherokee/cherokee.spec:1.25 --- packages/cherokee/cherokee.spec:1.24 Sat Nov 28 03:31:27 2009 +++ packages/cherokee/cherokee.spec Wed Apr 7 14:31:26 2010 @@ -1,13 +1,6 @@ # $Revision$, $Date$ # TODO: # - does it requires spawn-fcgi? -# - warning: Installed (but unpackaged) file(s) found: -# /usr/share/locale/de/LC_MESSAGES/cherokee.mo -# /usr/share/locale/en/LC_MESSAGES/cherokee.mo -# /usr/share/locale/es/LC_MESSAGES/cherokee.mo -# /usr/share/locale/nl/LC_MESSAGES/cherokee.mo -# /usr/share/locale/sv_SE/LC_MESSAGES/cherokee.mo -# /usr/share/locale/zh_CN/LC_MESSAGES/cherokee.mo # # Conditional build: %bcond_without geoip # without GeoIP support @@ -15,12 +8,12 @@ Summary: Fast, Flexible and Lightweight Web server Summary(pl.UTF-8): Cherokee - serwer WWW Name: cherokee -Version: 0.99.29 +Version: 0.99.44 Release: 0.1 License: GPL v2 Group: Networking/Daemons Source0: http://www.cherokee-project.com/download/0.99/%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 236f17981c0c8908f6911fda239fc3a4 +# Source0-md5: 268e7130c12b441523de963f95b9b85d Source1: %{name}.init Source2: %{name}.sysconfig Patch0: %{name}-config.patch @@ -145,6 +138,11 @@ rm -rf html mv $RPM_BUILD_ROOT%{_docdir}/%{name} html +# provided via %doc +rm $RPM_BUILD_ROOT/etc/cherokee/cherokee.conf.perf_sample + +%find_lang %{name} + %clean rm -rf $RPM_BUILD_ROOT @@ -175,9 +173,9 @@ %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig -%files +%files -f %{name}.lang %defattr(644,root,root,755) -%doc AUTHORS ChangeLog html contrib/*to*.py +%doc AUTHORS ChangeLog html contrib/*to*.py performance.conf.sample %dir %attr(750,root,root) %{_sysconfdir} %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cherokee.conf @@ -212,7 +210,7 @@ %attr(755,root,root) %{_libdir}/cherokee/libplugin_evhost.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_exists.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_extensions.so -%attr(755,root,root) %{_libdir}/cherokee/libplugin_fastcgi.so +#%attr(755,root,root) %{_libdir}/cherokee/libplugin_fastcgi.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_fcgi.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_file.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_from.so @@ -232,6 +230,8 @@ %attr(755,root,root) %{_libdir}/cherokee/libplugin_or.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_pam.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_plain.so +%attr(755,root,root) %{_libdir}/cherokee/libplugin_post_report.so +%attr(755,root,root) %{_libdir}/cherokee/libplugin_post_track.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_proxy.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_redir.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_rehost.so @@ -245,6 +245,7 @@ %attr(755,root,root) %{_libdir}/cherokee/libplugin_ssi.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_streaming.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_target_ip.so +%attr(755,root,root) %{_libdir}/cherokee/libplugin_url_arg.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_uwsgi.so %attr(755,root,root) %{_libdir}/cherokee/libplugin_wildcard.so @@ -304,6 +305,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.25 2010/04/07 12:31:26 jajcus +- Version: 0.99.44 +- use find_lang to package localisation + Revision 1.24 2009/11/28 02:31:27 pawelz - dropped spawn-fcgi (dropped upstream, but does it requires spawn-fcgi?) - dropped gnutls (dropped upstream) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cherokee/cherokee-config.patch?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cherokee/cherokee.spec?r1=1.24&r2=1.25&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
