gunnar: server/php-kolab/Kolab_Freebusy ChangeLog, 1.25, 1.26 Kolab_FreeBusy.spec, 1.18, 1.19 Makefile, 1.6, 1.7 kolab_issue3313.patch, 1.1, NONE package.xml, 1.3, NONE

cvs at kolab.org cvs at kolab.org
Fri Mar 6 22:10:51 CET 2009


Author: gunnar

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

Modified Files:
	ChangeLog Kolab_FreeBusy.spec Makefile 
Removed Files:
	kolab_issue3313.patch package.xml 
Log Message:
Update to Kolab_FreeBusy-0.1.3.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- ChangeLog	17 Feb 2009 16:59:35 -0000	1.25
+++ ChangeLog	6 Mar 2009 21:10:49 -0000	1.26
@@ -1,3 +1,7 @@
+2009-03-06  Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_FreeBusy.spec: Update to 0.1.3.
+
 2009-02-17  Thomas Arendsen Hein  <thomas at intevation.de>
 
 	* Kolab_FreeBusy.spec: free/busy broken by fix for kolab/issue3313,

Index: Kolab_FreeBusy.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Kolab_FreeBusy.spec	26 Feb 2009 17:05:15 -0000	1.18
+++ Kolab_FreeBusy.spec	6 Mar 2009 21:10:49 -0000	1.19
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_FreeBusy
-%define         V_version 0.1.2
-%define         V_release 20090226
+%define         V_version 0.1.3
+%define         V_release 20090306
 
 # Package Information
 Name:	   %{V_package}
@@ -16,11 +16,9 @@
 
 # List of Sources
 Source0:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
-Source1:    package.xml
 
 # List of patches
-Patch0:    kolab_issue3313.patch
-Patch1:    issue3438.patch
+#Patch0:    issueXYZ.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -53,10 +51,10 @@
 
 %prep
 	%setup -n %{V_package}-%{V_version}
-        %patch -p1 -P 0
-        %patch -p3 -P 1
-        cp %{S:1} .
 
+#	%patch -p1 -P 0
+
+	cat ../package.xml | sed -e 's/md5sum="[^"]*"//' > package.xml
 %build
 
 %install
@@ -69,6 +67,7 @@
 	rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb,.depdblock}
 
         %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                     \
+	    '%config(noreplace) %{l_prefix}/var/kolab/www/freebusy/config.php' \
             %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab-freebusy/cache    \
             %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab-freebusy/log
 

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	26 Feb 2009 17:05:15 -0000	1.6
+++ Makefile	6 Mar 2009 21:10:49 -0000	1.7
@@ -1,6 +1,7 @@
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+PATCHES = $(shell ls *.patch)
 
 ifeq "x$(RPM)" "x"
   RPM = $(HOME)/bin/openpkg rpm
@@ -21,7 +22,7 @@
 
 SOURCE_URL=http://pear.horde.org/get
 SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog kolab_issue3313.patch issue3438.patch package.xml
+EXTRA=ChangeLog $(PATCHES)
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

--- kolab_issue3313.patch DELETED ---

--- package.xml DELETED ---





More information about the commits mailing list