gunnar: server/php-kolab/Kolab_Freebusy ChangeLog, 1.29, 1.30 Kolab_FreeBusy.spec, 1.27, 1.28 Makefile, 1.10, 1.11 package.info, 1.4, 1.5

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy
In directory doto:/tmp/cvs-serv24115/d/Kolab_Freebusy

Modified Files:
	ChangeLog Kolab_FreeBusy.spec Makefile package.info 
Log Message:
freebusy.conf.template.in moved to the Kolab_FreeBusy package. kolab/issue3544 (Cached xfb access not up to date for changed distribution lists)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ChangeLog	25 Mar 2010 16:28:18 -0000	1.29
+++ ChangeLog	16 May 2010 07:03:41 -0000	1.30
@@ -1,3 +1,12 @@
+2010-05-16  Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_FreeBusy.spec: Update to 0.1.6
+
+	freebusy.conf.template.in moved to the Kolab_FreeBusy package.
+
+	kolab/issue3544 (Cached xfb access not up to date for changed
+	distribution lists)
+
 2010-03-25  Gunnar Wrobel  <p at rdus.de>
 
 	* patches/Kolab_FreeBusy-0.1.5/issue3983.patch:

Index: Kolab_FreeBusy.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Kolab_FreeBusy.spec	30 Mar 2010 06:57:44 -0000	1.27
+++ Kolab_FreeBusy.spec	16 May 2010 07:03:41 -0000	1.28
@@ -6,8 +6,8 @@
 %define         V_package_origin WGET
 %define         V_repo_commit 
 %define         V_repo_release 
-%define         V_version 0.1.5
-%define         V_release 20100330
+%define         V_version 0.1.6
+%define         V_release 20100516
 %define         V_sourceurl http://pear.horde.org/get
 %define         V_php_lib_loc php
 %define         V_www_loc freebusy
@@ -26,7 +26,8 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source:    %{V_sourceurl}/%{V_pear_package}-%{V_version}.tgz
+Source0:    %{V_sourceurl}/%{V_pear_package}-%{V_version}.tgz
+Source1:    freebusy.conf.template
 
 # List of patches
 Patch0:    package.patch
@@ -76,6 +77,7 @@
 %install
         %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab-freebusy/log
         %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab-freebusy/cache
+	%{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"                                       \
@@ -91,6 +93,9 @@
                 %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/%{l_prefix}/lib
                 cp -a $RPM_BUILD_ROOT/%{l_prefix}/lib/%{V_php_lib_loc} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/%{l_prefix}/lib/
         %endif
+
+	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} \
+	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
 
         %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                     \
                 '%config(noreplace) %{l_prefix}/var/kolab/www/freebusy/config.php' \

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile	22 Jan 2010 15:36:04 -0000	1.10
+++ Makefile	16 May 2010 07:03:41 -0000	1.11
@@ -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_Freebusy/package.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- package.info	30 Mar 2010 06:57:44 -0000	1.4
+++ package.info	16 May 2010 07:03:41 -0000	1.5
@@ -13,10 +13,10 @@
 package_origin='WGET'
 
 # Version number
-version='0.1.5'
+version='0.1.6'
 
 # Package release number
-release='20100330'
+release='20100516'
 
 # Source URL to download from
 sourceurl='http://pear.horde.org/get'