gunnar: server/php-kolab/Kolab_Filter ChangeLog, 1.26, 1.27 Kolab_Filter.spec, 1.14, 1.15 Makefile, 1.5, 1.6 package.xml, 1.3, NONE

cvs at kolab.org cvs at kolab.org
Tue Feb 24 12:57:48 CET 2009


Author: gunnar

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

Modified Files:
	ChangeLog Kolab_Filter.spec Makefile 
Removed Files:
	package.xml 
Log Message:
 kolab/issue3299,  kolab/issue3364,  kolab/issue3426,  kolab/issue2499,  kolab/issue3192.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ChangeLog	12 Dec 2008 15:26:28 -0000	1.26
+++ ChangeLog	24 Feb 2009 11:57:46 -0000	1.27
@@ -1,3 +1,7 @@
+2009-02-24  Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_Filter.spec: Update to 0.1.4
+
 2008-12-12  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_Filter.spec: Update to 0.1.3.

Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Kolab_Filter.spec	12 Dec 2008 15:26:28 -0000	1.14
+++ Kolab_Filter.spec	24 Feb 2009 11:57:46 -0000	1.15
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Filter
-%define         V_version 0.1.3
-%define         V_release 20081212
+%define         V_version 0.1.4
+%define         V_release 20090224
 
 # Package Information
 Name:	   %{V_package}
@@ -36,6 +36,8 @@
 PreReq:       PEAR-Mail
 PreReq:       Horde_iCalendar
 PreReq:       Horde_Argv
+PreReq:       Horde_Notification
+PreReq:       Horde_Prefs
 
 Provides:     php-kolab = 2.2.1
 Obsoletes:    php-kolab < 2.2.1 PEAR-Net_IMAP kolab-filter

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	5 Dec 2008 17:24:01 -0000	1.5
+++ Makefile	24 Feb 2009 11:57:46 -0000	1.6
@@ -15,7 +15,12 @@
   KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
-SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
+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
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
@@ -30,11 +35,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 $(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

--- package.xml DELETED ---





More information about the commits mailing list