gunnar: server/php-kolab/Kolab_Filter ChangeLog, 1.36, 1.37 Kolab_Filter.spec, 1.31, 1.32 Makefile, 1.13, 1.14 package.info, 1.6, 1.7

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv6055/Kolab_Filter

Modified Files:
	ChangeLog Kolab_Filter.spec Makefile package.info 
Log Message:
kolab/issue3522 (No logrotate for kolab-filter.log and friends). Also moved the resmgr.conf.template into the Kolab_Filter package where it belongs.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- ChangeLog	15 Jul 2010 21:57:23 -0000	1.36
+++ ChangeLog	21 Jul 2010 17:43:59 -0000	1.37
@@ -1,4 +1,11 @@
-2010-07-15  root  <root at temple>
+2010-07-21  Gunnar Wrobel  <p at rdus.de>
+
+	* templates/Kolab_Filter-0.1.10/rc.filter.template:
+
+	kolab/issue3522 (No logrotate for kolab-filter.log and friends)
+
+
+2010-07-15  Gunnar Wrobel  <p at rdus.de>
 
 	* package.info: Update to 0.1.10.
 

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Kolab_Filter.spec	15 Jul 2010 21:57:23 -0000	1.31
+++ Kolab_Filter.spec	21 Jul 2010 17:43:59 -0000	1.32
@@ -7,7 +7,7 @@
 %define         V_repo_commit 
 %define         V_repo_release 
 %define         V_version 0.1.10
-%define         V_release 20100715
+%define         V_release 20100721
 %define         V_sourceurl http://pear.horde.org/get
 %define         V_php_lib_loc php
 %define         V_www_loc 
@@ -26,7 +26,9 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source:    %{V_sourceurl}/%{V_pear_package}-%{V_version}.tgz
+Source0:    %{V_sourceurl}/%{V_pear_package}-%{V_version}.tgz
+Source1:    filter.conf.template
+Source2:    rc.filter.template
 
 # List of patches
 Patch0:    package.patch
@@ -85,6 +87,7 @@
         %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab-filter/locks
         %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab-filter/tmp
         %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/man/man1
+	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
 
         env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M"\
             PHP_PEAR_CACHE_DIR="/tmp/pear/cache"                                       \
@@ -103,6 +106,9 @@
 
 	cp $RPM_BUILD_ROOT/%{l_prefix}/lib/php/doc/Kolab_Filter/man/man1/kolabfilter.1 $RPM_BUILD_ROOT/%{l_prefix}/man/man1
 	cd $RPM_BUILD_ROOT/%{l_prefix}/man/man1 && ln -s kolabfilter.1 kolabmailboxfilter.1 && cd -
+
+	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} \
+	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
 
         %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                 \
             %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab-filter/tmp    \

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile	22 Jan 2010 15:36:03 -0000	1.13
+++ Makefile	21 Jul 2010 17:43:59 -0000	1.14
@@ -1,2 +1,7 @@
 SPEC_PRESENT = yes
 include ../../make-helper/pear.mk
+
+# Get the list of templates if there are any in the template directory
+TEMPLATES = $(shell ls templates/$(PACKAGE)-$(VERSION)/*.template 2> /dev/null)
+
+EXTRA = package.patch $(TEMPLATES)

Index: package.info
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/package.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- package.info	16 Jul 2010 19:14:31 -0000	1.6
+++ package.info	21 Jul 2010 17:43:59 -0000	1.7
@@ -16,7 +16,7 @@
 version='0.1.10'
 
 # Package release number
-release='20100715'
+release='20100721'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel'