packages: cherokee/cherokee-panic_path.patch, cherokee/cherokee.spec - Vers...

[jajcus]

Author: jajcus                       Date: Tue Nov 30 19:02:05 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Version: 1.0.10

---- Files affected:
packages/cherokee:
   cherokee-panic_path.patch (1.1 -> 1.2) , cherokee.spec (1.44 -> 1.45) 

---- Diffs:

================================================================
Index: packages/cherokee/cherokee-panic_path.patch
diff -u packages/cherokee/cherokee-panic_path.patch:1.1 packages/cherokee/cherokee-panic_path.patch:1.2
--- packages/cherokee/cherokee-panic_path.patch:1.1	Tue Oct 21 20:45:06 2008
+++ packages/cherokee/cherokee-panic_path.patch	Tue Nov 30 20:01:57 2010
@@ -9,14 +9,14 @@
  server!pid_file = %localstatedir%/run/cherokee.pid
  
  # Default virtual server
---- cherokee-0.9.4/admin/configured.py.pre.orig	2008-09-26 23:29:35.000000000 +0200
-+++ cherokee-0.9.4/admin/configured.py.pre	2008-10-21 20:37:10.000000000 +0200
-@@ -14,7 +14,7 @@
- CHEROKEE_ADMINDIR   = join (PREFIX, "share/cherokee/admin")
- CHEROKEE_ICONSDIR   = join (PREFIX, "share/cherokee/icons")
- CHEROKEE_THEMEDIR   = join (PREFIX, "share/cherokee/themes")
--CHEROKEE_PANIC_PATH = join (PREFIX, "bin/cherokee-panic")
-+CHEROKEE_PANIC_PATH = join (PREFIX, "sbin/cherokee-panic")
- CHEROKEE_PLUGINDIR  = join (LIBDIR, "cherokee")
- CHEROKEE_DATADIR    = join (DATADIR, "cherokee")
- CHEROKEE_DEPSDIR    = join (DATADIR, "cherokee/deps")
+--- cherokee-1.0.10/admin/configured.py.pre.orig	2010-10-28 11:42:31.000000000 +0200
++++ cherokee-1.0.10/admin/configured.py.pre	2010-11-30 18:36:22.000000000 +0100
+@@ -17,7 +17,7 @@
+ CHEROKEE_ADMINDIR     = join (PREFIX, "share/cherokee/admin")
+ CHEROKEE_ICONSDIR     = join (PREFIX, "share/cherokee/icons")
+ CHEROKEE_THEMEDIR     = join (PREFIX, "share/cherokee/themes")
+-CHEROKEE_PANIC_PATH   = join (PREFIX, "bin/cherokee-panic")
++CHEROKEE_PANIC_PATH   = join (PREFIX, "sbin/cherokee-panic")
+ CHEROKEE_PLUGINDIR    = join (LIBDIR, "cherokee")
+ CHEROKEE_DATADIR      = join (DATADIR, "cherokee")
+ CHEROKEE_DEPSDIR      = join (DATADIR, "cherokee/deps")

================================================================
Index: packages/cherokee/cherokee.spec
diff -u packages/cherokee/cherokee.spec:1.44 packages/cherokee/cherokee.spec:1.45
--- packages/cherokee/cherokee.spec:1.44	Tue Aug 31 19:37:25 2010
+++ packages/cherokee/cherokee.spec	Tue Nov 30 20:01:57 2010
@@ -14,12 +14,12 @@
 Summary:	Fast, Flexible and Lightweight Web server
 Summary(pl.UTF-8):	Cherokee - serwer WWW
 Name:		cherokee
-Version:	1.0.8
+Version:	1.0.10
 Release:	1
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	http://www.cherokee-project.com/download/1.0/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	12117a80c2a970173bd32660439c2db0
+# Source0-md5:	bca6dc0ec3eedd1c6e35bce5885bacdc
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.upstart
@@ -227,7 +227,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog html contrib/*to*.py performance.conf.sample
+%doc AUTHORS ChangeLog html performance.conf.sample
 %dir %attr(750,root,root) %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cherokee.conf
 
@@ -235,6 +235,7 @@
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/cherokee
 %attr(754,root,root) /etc/rc.d/init.d/cherokee
 
+%attr(755,root,root) %{_bindir}/CTK-run
 %attr(755,root,root) %{_bindir}/cget
 %attr(755,root,root) %{_bindir}/cherokee-tweak
 %attr(755,root,root) %{_sbindir}/cherokee
@@ -299,6 +300,7 @@
 %attr(755,root,root) %{_libdir}/cherokee/libplugin_tls.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_v_or.so
 %attr(755,root,root) %{_libdir}/cherokee/libplugin_wildcard.so
 
 %{_mandir}/man1/cget.1*
@@ -347,6 +349,9 @@
 %dir %{_datadir}/cherokee/admin/wizards
 %{_datadir}/cherokee/admin/wizards/*.py
 %{_datadir}/cherokee/admin/wizards/*.pyc
+%dir %{_datadir}/cherokee/admin/market
+%{_datadir}/cherokee/admin/market/*.py
+%{_datadir}/cherokee/admin/market/*.pyc
 
 %files libs
 %defattr(644,root,root,755)
@@ -354,8 +359,6 @@
 %attr(755,root,root) %ghost %{_libdir}/libcherokee-base.so.0
 %attr(755,root,root) %{_libdir}/libcherokee-client.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libcherokee-client.so.0
-%attr(755,root,root) %{_libdir}/libcherokee-config.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcherokee-config.so.0
 %attr(755,root,root) %{_libdir}/libcherokee-server.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libcherokee-server.so.0
 
@@ -364,11 +367,9 @@
 %attr(755,root,root) %{_bindir}/cherokee-config
 %attr(755,root,root) %{_libdir}/libcherokee-base.so
 %attr(755,root,root) %{_libdir}/libcherokee-client.so
-%attr(755,root,root) %{_libdir}/libcherokee-config.so
 %attr(755,root,root) %{_libdir}/libcherokee-server.so
 %{_libdir}/libcherokee-base.la
 %{_libdir}/libcherokee-client.la
-%{_libdir}/libcherokee-config.la
 %{_libdir}/libcherokee-server.la
 %{_includedir}/cherokee
 %{_pkgconfigdir}/cherokee.pc
@@ -381,6 +382,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45  2010/11/30 19:01:57  jajcus
+- Version: 1.0.10
+
 Revision 1.44  2010/08/31 17:37:25  jajcus
 - Verision: 1.0.8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cherokee/cherokee-panic_path.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cherokee/cherokee.spec?r1=1.44&r2=1.45&f=u