gunnar: server/horde/horde Makefile, 1.10, 1.11 horde-kolab.spec, 1.4, 1.5

cvs at kolab.org cvs at kolab.org
Mon Jul 23 18:07:14 CEST 2007


Author: gunnar

Update of /kolabrepository/server/horde/horde
In directory doto:/tmp/cvs-serv16960/horde/horde

Modified Files:
	Makefile horde-kolab.spec 
Log Message:
Improved build mechanisms for both the PEAR and the Horde packages.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile	11 Jul 2007 14:38:06 -0000	1.10
+++ Makefile	23 Jul 2007 16:06:42 -0000	1.11
@@ -1,4 +1,12 @@
+ifeq "x$(KOLABRPMSRC)" "x"
+  KOLABRPMSRC = /kolab/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+  KOLABRPMPKG = /kolab/RPM/PKG
+endif
+
 RPM = /kolab/bin/openpkg rpm
+
 HORDE_NAME = $(shell grep "%define[ ]*V_horde_name" *.spec | sed -e "s/.*V_horde_name \([a-z-]*\).*/\1/")
 YEAR = $(shell grep "%define[ ]*V_year" *.spec | sed -e "s/.*V_year\s*\([0-9]*\).*/\1/")
 MONTH = $(shell grep "%define[ ]*V_month" *.spec | sed -e "s/.*V_month\s*\([0-9]*\).*/\1/")
@@ -14,15 +22,23 @@
 TEMPLATES = $(shell find . -name "*.template")
 CONFIGS = $(shell find . -name "*.php")
 
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = /kolab/RPM/SRC
-endif
-
-# Remove once moving to kolab cvs
 PACKAGE_0=$(HORDE_NAME)-HEAD-$(DATE).tar.gz
 SOURCE_0=http://ftp.horde.org/pub/snaps/${DATE}/$(PACKAGE_0)
 
-all:
+.PHONY: all
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+.PHONY: dist
+dist: all
+	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
+
+.PHONY: clean
+clean:
+	rm -rf /kolab/RPM/TMP/$(PACKAGE)
+	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	rm -rf *~
+
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
 
@@ -51,8 +67,4 @@
 
 	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
 
-dist: all
-	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../../stage/
-
-binary:
-	$(RPM) -bB $(PACKAGE).spec
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .

Index: horde-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde/horde-kolab.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- horde-kolab.spec	19 Jul 2007 15:56:22 -0000	1.4
+++ horde-kolab.spec	23 Jul 2007 16:06:42 -0000	1.5
@@ -3,7 +3,7 @@
 %define         V_package %{V_horde_name}-kolab
 %define         V_year  2007
 %define         V_month 07
-%define         V_day   19
+%define         V_day   23
 %define		V_version %{V_year}%{V_month}%{V_day}
 %define		V_date %{V_year}-%{V_month}-%{V_day}
 %define         V_release 1





More information about the commits mailing list