gunnar: server/php-kolab/Kolab_Storage ChangeLog, 1.3, 1.4 Kolab_Storage.spec, 1.6, 1.7 Makefile, 1.5, 1.6
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_Storage
In directory doto:/tmp/cvs-serv16209/php-kolab/Kolab_Storage
Modified Files:
ChangeLog Kolab_Storage.spec Makefile
Log Message:
kolab/issue3299, kolab/issue3364, kolab/issue3426, kolab/issue2499, kolab/issue3192.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog 5 Dec 2008 06:43:39 -0000 1.3
+++ ChangeLog 24 Feb 2009 11:57:46 -0000 1.4
@@ -1,3 +1,7 @@
+2009-02-24 Gunnar Wrobel <p at rdus.de>
+
+ * Kolab_Storage.spec: Update to 0.4.0.
+
2008-12-05 Gunnar Wrobel <p at rdus.de>
* Kolab_Storage.spec: Update to 0.3.0.
Index: Kolab_Storage.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/Kolab_Storage.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Kolab_Storage.spec 5 Dec 2008 06:43:39 -0000 1.6
+++ Kolab_Storage.spec 24 Feb 2009 11:57:46 -0000 1.7
@@ -1,7 +1,7 @@
# Variables
%define V_package Kolab_Storage
-%define V_version 0.3.0
-%define V_release 20081205
+%define V_version 0.4.0
+%define V_release 20090224
# Package Information
Name: %{V_package}
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 5 Dec 2008 06:43:39 -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
More information about the commits
mailing list