gunnar: server/php-kolab DEVELOPMENT,1.5,1.6 Makefile,1.9,1.10

cvs at kolab.org cvs at kolab.org
Wed Oct 17 12:00:00 CEST 2007


Author: gunnar

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

Modified Files:
	DEVELOPMENT Makefile 
Log Message:
PEAR does not support snapshots between prerelease versions. This workaround is a suggestion to solve that.

Index: DEVELOPMENT
===================================================================
RCS file: /kolabrepository/server/php-kolab/DEVELOPMENT,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- DEVELOPMENT	17 Oct 2007 07:44:03 -0000	1.5
+++ DEVELOPMENT	17 Oct 2007 09:59:57 -0000	1.6
@@ -28,7 +28,7 @@
 Released packages should have the same core version as the server
 release. As a part of Kolab Server 2.2.0 the version number should be
 2.2.0. Pre-release candidates receive the suffix "betaX" or "rcX"
-(e.g. 2.2.beta1).
+(e.g. 2.2beta1). 
 
 Before 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 switch needs to
@@ -37,6 +37,11 @@
   VERSION = 2.2.0
   CVS = 0
 
+For prereleases you will also have to set the following variables:
+
+  PRERELEASE = beta
+  PRERELEASE_VERSION = 1
+
 In addition you should copy the relevant section from
 Kolab_*/ChangeLog into Kolab_*/package.xml.in.
 
@@ -65,6 +70,10 @@
 
   Kolab_*-2.2.0.20070819.tgz
   php-kolab-2.2.0+cvs-20070819.src.rpm
+
+Please note that PEAR does not really support using snapshots between
+prereleases. This leads to some weird release numbers on the source
+packages in the prerelease phase.
 
 Change log
 ==========

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile	17 Oct 2007 07:23:20 -0000	1.9
+++ Makefile	17 Oct 2007 09:59:57 -0000	1.10
@@ -2,15 +2,27 @@
 RELEASE = $(shell date '+%Y%m%d')
 DATE = $(shell date '+%Y-%m-%d')
 
-VERSION = 2.2.beta1
+VERSION = 2.2
+PRERELEASE = beta
+PRERELEASE_VERSION = 1
 CVS = 1
 
-ifeq "x$(CVS)" "x0"
-  SOURCE_TAG = $(VERSION)
-  SPEC_VERSION = $(VERSION)
+ifeq "x$(PRERELEASE)" "x"
+  ifeq "x$(CVS)" "x0"
+    SOURCE_TAG = $(VERSION)
+    SPEC_VERSION = $(VERSION)
+  else
+    SOURCE_TAG = $(VERSION).$(RELEASE)
+    SPEC_VERSION = $(RPM_VERSION)+cvs
+  endif
 else
-  SOURCE_TAG = $(VERSION).$(RELEASE)
-  SPEC_VERSION = $(VERSION)+cvs
+  PEAR_RELEASE = $(shell echo $$(($(PRERELEASE_VERSION) * $(RELEASE))))
+  SOURCE_TAG = $(VERSION)$(PRERELEASE)$(PEAR_RELEASE)
+  ifeq "x$(CVS)" "x0"
+    SPEC_VERSION = $(VERSION).$(PRERELEASE)$(PRERELEASE_VERSION)
+  else
+    SPEC_VERSION = $(VERSION).$(PRERELEASE)$(PRERELEASE_VERSION)+cvs
+  endif
 endif
 
 MODULES = Kolab_Freebusy \





More information about the commits mailing list