- Version: 0.99.44

- use find_lang to package localisation

Changed files:
    cherokee-config.patch -> 1.6
    cherokee.spec -> 1.25

diff --git a/cherokee-config.patch b/cherokee-config.patch
index 3c976eb93a74ac939ffac4f7fe7d19dbd2ec4f8d..8420105ab3067aa458429cbc929e2fab11541d78 100644 (file)
--- a/cherokee-config.patch
+++ b/cherokee-config.patch
@@ -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

diff --git a/cherokee.spec b/cherokee.spec
index aaed057b3b4f20501c14414d6919a26bcfd2a448..8fddc4611a7a62105287f4954446d8d650b267e9 100644 (file)
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -1,12 +1,5 @@
 # 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
@@ -14,12 +7,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
@@ -144,6 +137,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/cherokee/lib*.la
 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
 
@@ -174,9 +172,9 @@ fi
 %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
 
@@ -211,7 +209,7 @@ fi
 %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
@@ -231,6 +229,8 @@ fi
 %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
@@ -244,6 +244,7 @@ fi
 %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