gunnar: server/php-kolab/Kolab_Freebusy Kolab_FreeBusy.spec, 1.17, 1.18 Makefile, 1.5, 1.6

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	Kolab_FreeBusy.spec Makefile 
Log Message:
 kolab/issue3438 (kolabFreeBusyPast is not used)

Index: Kolab_FreeBusy.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Kolab_FreeBusy.spec	17 Feb 2009 16:59:35 -0000	1.17
+++ Kolab_FreeBusy.spec	26 Feb 2009 17:05:15 -0000	1.18
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_FreeBusy
 %define         V_version 0.1.2
-%define         V_release 20090217
+%define         V_release 20090226
 
 # Package Information
 Name:	   %{V_package}
@@ -20,6 +20,7 @@
 
 # List of patches
 Patch0:    kolab_issue3313.patch
+Patch1:    issue3438.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -53,6 +54,7 @@
 %prep
 	%setup -n %{V_package}-%{V_version}
         %patch -p1 -P 0
+        %patch -p3 -P 1
         cp %{S:1} .
 
 %build

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	15 Dec 2008 06:15:55 -0000	1.5
+++ Makefile	26 Feb 2009 17:05:15 -0000	1.6
@@ -15,8 +15,13 @@
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
-SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog kolab_issue3313.patch package.xml
+ifeq "x$(PLATTAG)" "x"
+	PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%)
+endif
+
+SOURCE_URL=http://pear.horde.org/get
+SOURCE_0=$(PACKAGE)-$(VERSION).tgz
+EXTRA=ChangeLog kolab_issue3313.patch issue3438.patch package.xml
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
@@ -31,11 +36,16 @@
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog
+$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0):
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
-	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
+	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_URL)/$(SOURCE_0)"
 
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
 	cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
 
 	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
+
+.PHONY: install
+install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
+	$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm