gunnar: server/php-kolab DEVELOPMENT,1.1,1.2 Makefile,1.4,1.5

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	DEVELOPMENT Makefile 
Log Message:
Adapt the version numbering to the latest scheme proposed.

Index: DEVELOPMENT
===================================================================
RCS file: /kolabrepository/server/php-kolab/DEVELOPMENT,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DEVELOPMENT	13 Aug 2007 14:14:13 -0000	1.1
+++ DEVELOPMENT	15 Aug 2007 19:49:43 -0000	1.2
@@ -36,11 +36,11 @@
 
 Source packages will then look like this:
 
-  Kolab_*-2.1.0.20070815tar.gz
+  Kolab_*-2.1.0.20070815.tar.gz
 
-Source RPMs will be named similar:
+Source RPMs will be named like this:
 
- php-kolab-2.1.0_cvs-20070815.src.rpm
+ php-kolab-2.1.0.cvs-20070815.src.rpm
 
 For tagging the next release the version number needs to be increased
 to the new Kolab Server version (e.g. 2.2.0) and the CVS parameter

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	13 Aug 2007 14:14:13 -0000	1.4
+++ Makefile	15 Aug 2007 19:49:43 -0000	1.5
@@ -7,8 +7,10 @@
 
 ifeq "x$(CVS)" "x0"
   SOURCE_TAG = $(VERSION)
+  SPEC_VERSION = $(VERSION)
 else
   SOURCE_TAG = $(VERSION).$(RELEASE)
+  SPEC_VERSION = $(VERSION).cvs
 endif
 
 MODULES = Kolab_Freebusy \
@@ -31,11 +33,14 @@
 endif
 
 .PHONY: all
-all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+all: $(PACKAGE)-$(SPEC_VERSION)-$(RELEASE).src.rpm
 
 .PHONY: dist
 dist: all
-	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+	cp $(PACKAGE)-$(SPEC_VERSION)-$(RELEASE).src.rpm ../stage/
+
+.PHONY: clean_all
+clean_all: clean
 
 .PHONY: clean
 clean:
@@ -48,20 +53,20 @@
 	rm -rf *.src.rpm
 	rm -rf *.tgz
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(SOURCES)
+$(PACKAGE)-$(SPEC_VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(SOURCES)
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 
 	cp $(SOURCES) $(KOLABRPMSRC)/$(PACKAGE)/
 
 	cp $(PACKAGE).spec $(PACKAGE).spec.tmp
-	sed -i -e 's/\@VERSION\@/$(VERSION)/' $(PACKAGE).spec.tmp
+	sed -i -e 's/\@VERSION\@/$(SPEC_VERSION)/' $(PACKAGE).spec.tmp
 	sed -i -e 's/\@RELEASE\@/$(RELEASE)/' $(PACKAGE).spec.tmp
 	sed -i -e 's/\@SOURCE_TAG\@/$(SOURCE_TAG)/' $(PACKAGE).spec.tmp
 	mv $(PACKAGE).spec.tmp $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec
 
 	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
 
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(SPEC_VERSION)-$(RELEASE).src.rpm .
 
 $(SOURCES):
 	cat $(@:%-$(SOURCE_TAG).tgz=%)/package.xml.in | \