gunnar: server/kolab-filter DEVELOPMENT, 1.1, 1.2 Makefile, 1.1, 1.2 kolab-filter.spec, 1.1, 1.2

[cvs at kolab.org]

Author: gunnar

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

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

Index: DEVELOPMENT
===================================================================
RCS file: /kolabrepository/server/kolab-filter/DEVELOPMENT,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DEVELOPMENT	9 Aug 2007 15:51:20 -0000	1.1
+++ DEVELOPMENT	15 Aug 2007 19:30:16 -0000	1.2
@@ -15,27 +15,41 @@
 Version numbering
 =================
 
-kolab-filter is a Kolab Server core package. It should have the same
-version as the Server release. As a part of Kolab Server 2.1 the
-version number should be 2.1.
+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.
 
-Once development picks up after a release, the version number should
-be switched to $(OLD_VERSION).99 e.g. 2.1.99. There'll be no changes
-of the version during development as there are no source packages
-being released.
+Released source packages will look like this:
 
-For the next release the version number will be increased to the new
-Kolab Server version e.g. 2.2 and a new source packge will be
-provided.
+ kolab-filter-2.1.0.tar.gz
 
-A NEW VERSION HAS TO BE SET IN 
+Released source RPMs will look like this:
+
+ kolab-filter-2.1.0-20070819.src.rpm
+
+A NEW VERSION AND RELEASE NUMBER HAVE TO BE SET IN
 
   kolab-filter.spec
 
-For testing purposes the "dist" target will produce source RPM
-packages that have the release number from kolab-filter.spec
-attached. You will have to update this release number manually in the
-spec file.
+Once development picks up after a release, please set
+
+%define       V_cvs 1
+
+in kolab-filter.spec.
+
+Source packages will then look like this:
+
+ kolab-filter-2.1.0.cvs-20070810.tar.gz
+
+Source RPMs will be named similar:
+
+ kolab-filter-2.1.0.cvs-20070810.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 variable needs
+to be reset to 0:
+
+%define       V_cvs 0
 
 Change log
 ==========
@@ -43,6 +57,10 @@
 The change log for the package is provided in
 "filter/docs/ChangeLog". Please keep this file up-to-date if you
 change the source code of this package.
+
+Depending on the editor it may be helpful to link
+filter/docs/ChangeLog to ChangeLog in the top level directory of this
+package.
 
 Contributors
 ============

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-filter/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	9 Aug 2007 15:51:20 -0000	1.1
+++ Makefile	15 Aug 2007 19:30:16 -0000	1.2
@@ -1,8 +1,15 @@
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([a-z\_-]*\).*/\1/")
-VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+BASE_VERSION = $(shell grep "%define[ ]*V_base_version" *.spec | sed -e "s/.*V_base_version\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+CVS = $(shell grep "%define[ ]*V_cvs" *.spec | sed -e "s/.*V_cvs\s*\([01]\).*/\1/")
 
+ifeq "x$(CVS)" "x1"
+VERSION=$(BASE_VERSION).cvs
+TAR=$(PACKAGE)-$(VERSION)-$(RELEASE).tar.bz2
+else
+VERSION=$(BASE_VERSION)
 TAR=$(PACKAGE)-$(VERSION).tar.bz2
+endif
 
 ifeq "x$(RPM)" "x"
   RPM = $(HOME)/bin/openpkg rpm
@@ -23,6 +30,9 @@
 .PHONY: dist
 dist: all
 	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+
+.PHONY: clean_all
+clean_all: clean
 
 .PHONY: clean
 clean:

Index: kolab-filter.spec
===================================================================
RCS file: /kolabrepository/server/kolab-filter/kolab-filter.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab-filter.spec	9 Aug 2007 15:51:20 -0000	1.1
+++ kolab-filter.spec	15 Aug 2007 19:30:16 -0000	1.2
@@ -25,8 +25,17 @@
 
 #   versions of individual parts
 %define       V_package kolab-filter
-%define       V_version 2.1.99
-%define       V_release 20070809
+%define       V_base_version 2.1.0
+%define       V_release 20070815
+%define       V_cvs 1
+
+%if "%{V_cvs}" == "1"
+%define       V_version %{V_base_version}.cvs
+%define       V_tar %{V_package}-%{V_version}-%{V_release}.tar.bz2
+%else
+%define       V_version %{V_base_version}
+%define       V_tar %{V_package}-%{V_version}.tar.bz2
+%endif
 
 #   package information
 Name:         %{V_package}
@@ -42,7 +51,7 @@
 Release:      %{V_release}
 
 #   list of sources
-Source0:      %{V_package}-%{V_version}.tar.bz2
+Source0:      %{V_tar}
 
 #   build information
 Prefix:       %{l_prefix}