gunnar: server/kolab-filter DEVELOPMENT,1.3,1.4 Makefile,1.4,1.5

cvs at kolab.org cvs at kolab.org
Wed Oct 17 09:43:13 CEST 2007


Author: gunnar

Update of /kolabrepository/server/kolab-filter
In directory doto:/tmp/cvs-serv21909

Modified Files:
	DEVELOPMENT Makefile 
Log Message:
Update version numbers to the scheme agreed upon.

Index: DEVELOPMENT
===================================================================
RCS file: /kolabrepository/server/kolab-filter/DEVELOPMENT,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- DEVELOPMENT	24 Aug 2007 07:27:58 -0000	1.3
+++ DEVELOPMENT	17 Oct 2007 07:43:11 -0000	1.4
@@ -15,41 +15,56 @@
 Version numbering
 =================
 
-kolab-filter is a Kolab Server core package. Released packages should
-have the same core version as the Server release. As a part of Kolab
-Server 2.1.0 the version number should be 2.1.0.
+The package version will be set in
 
-Released source packages will look like this:
+  Makefile
 
- kolab-filter-2.1.0.tar.gz
+e.g.
 
-Released source RPMs will look like this:
+  VERSION = 2.2.beta1
+  CVS = 1
 
- kolab-filter-2.1.0-20070819.src.rpm
+Release versions
+----------------
 
-A NEW VERSION AND RELEASE NUMBER HAVE TO BE SET IN
+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).
 
-  Makefile
+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
+be set to 0:
 
-Once development picks up after a release, please set
+  VERSION = 2.2.0
+  CVS = 0
 
-  CVS = 1
+After updating VERSION and CVS you can commit these changes and tag
+the release.
 
-in kolab-filter.spec.
+Now you can create source tarballs and RPMs which will look like:
 
-Source packages will then look like this:
+  kolab-filter-2.2.0.tar.bz2
+  kolab-filter-2.2.0-20070819.src.rpm
 
- kolab-filter-2.1.0.cvs-20070810.tar.gz
+Don't forget to change CVS back to 1 again and commit, so later
+CVS snapshots will be named correctly.
 
-Source RPMs will be named similar:
+Snapshots
+---------
 
- kolab-filter-2.1.0.cvs-20070810.src.rpm
+Make sure Makefile contains the following line:
 
-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 variable needs
-to be reset to 0:
+  CVS = 1
+
+The release number will then receive the suffix "+cvs" and the current
+date will be appended.
+
+Source tarballs and RPMs will then look like this:
+
+  kolab-filter-2.2.0+cvs20070819.tar.bz2
+  kolab-filter-2.2.0+cvs-20070819.src.rpm
 
-  CVS = 0
 
 Change log
 ==========

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-filter/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	24 Aug 2007 07:14:16 -0000	1.4
+++ Makefile	17 Oct 2007 07:43:11 -0000	1.5
@@ -1,15 +1,15 @@
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([a-z\_-]*\).*/\1/")
 RELEASE = $(shell date '+%Y%m%d')
 
-VERSION = 2.1.0
+VERSION = 2.2.beta1
 CVS = 1
 
 ifeq "x$(CVS)" "x0"
   SOURCE_TAG = $(VERSION)
   SPEC_VERSION = $(VERSION)
 else
-  SOURCE_TAG = $(VERSION).cvs-$(RELEASE)
-  SPEC_VERSION = $(VERSION).cvs
+  SOURCE_TAG = $(VERSION)+cvs$(RELEASE)
+  SPEC_VERSION = $(VERSION)+cvs
 endif
 
 TAR = $(PACKAGE)-$(SOURCE_TAG).tar.bz2
@@ -33,6 +33,9 @@
 .PHONY: dist
 dist: all
 	cp $(PACKAGE)-$(SPEC_VERSION)-$(RELEASE).src.rpm ../stage/
+
+.PHONY: tardist
+tardist: $(TAR)
 
 .PHONY: clean_all
 clean_all: clean





More information about the commits mailing list