gunnar: server/kolab-freebusy DEVELOPMENT, 1.2, 1.3 Makefile, 1.2, 1.3 kolab-freebusy.spec, 1.3, 1.4

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-freebusy
In directory doto:/tmp/cvs-serv9312

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

Index: DEVELOPMENT
===================================================================
RCS file: /kolabrepository/server/kolab-freebusy/DEVELOPMENT,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DEVELOPMENT	13 Aug 2007 08:53:33 -0000	1.2
+++ DEVELOPMENT	15 Aug 2007 19:30:10 -0000	1.3
@@ -15,38 +15,41 @@
 Version numbering
 =================
 
-Version numbering
-=================
-
 kolab-freebusy 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.
 
 Released source packages will look like this:
 
- kolab-freebusy-2.1.0-20070813.tar.gz
+ kolab-freebusy-2.1.0.tar.gz
 
 Released source RPMs will look like this:
 
  kolab-freebusy-2.1.0-20070813.src.rpm
 
-A NEW VERSION HAS TO BE SET IN
+A NEW VERSION AND RELEASE NUMBER HAVE TO BE SET IN
 
   kolab-freebusy.spec
 
-Once development picks up after a release, please append the suffix
-"_cvs" to the version number.
+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-freebusy-2.1.0_cvs-20070815.tar.gz
+ kolab-freebusy-2.1.0.cvs-20070815.tar.gz
 
 Source RPMs will be named similar:
 
- kolab-freebusy-2.1.0_cvs-20070815.src.rpm
+ kolab-freebusy-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).
+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
 ==========
@@ -54,6 +57,10 @@
 The change log for the package is provided in
 "freebusy/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
+freebusy/docs/ChangeLog to ChangeLog in the top level directory of this
+package.
 
 Contributors
 ============

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-freebusy/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	13 Aug 2007 08:58:08 -0000	1.2
+++ Makefile	15 Aug 2007 19:30:10 -0000	1.3
@@ -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-freebusy.spec
===================================================================
RCS file: /kolabrepository/server/kolab-freebusy/kolab-freebusy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab-freebusy.spec	13 Aug 2007 08:53:33 -0000	1.3
+++ kolab-freebusy.spec	15 Aug 2007 19:30:10 -0000	1.4
@@ -25,8 +25,17 @@
 
 #   versions of individual parts
 %define       V_package kolab-freebusy
-%define       V_version 2.1.0_cvs
-%define       V_release 20070813
+%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}