gunnar: server/kolabconf DEVELOPMENT, 1.2, 1.3 Makefile.PL, 1.3, 1.4 kolabconf.spec, 1.3, 1.4

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolabconf
In directory doto:/tmp/cvs-serv17255

Modified Files:
	DEVELOPMENT Makefile.PL kolabconf.spec 
Log Message:
Fixes for the splitted packages. Configuration values read via Kolab.pm should not be used in global scope. The release number should be set manually.

Index: DEVELOPMENT
===================================================================
RCS file: /kolabrepository/server/kolabconf/DEVELOPMENT,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DEVELOPMENT	1 Aug 2007 15:08:12 -0000	1.2
+++ DEVELOPMENT	2 Aug 2007 06:43:09 -0000	1.3
@@ -36,5 +36,5 @@
   kolabconf.spec
 
 For testing purposes the "dist" target will produce source RPM
-packages that have the current date attached as release number. This
-allows you to continuously upgrade your test installation.
\ No newline at end of file
+packages that have the release number from the kolabconf.spec file
+attached. You need to update the kolabxonf.spec manually.
\ No newline at end of file

Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/kolabconf/Makefile.PL,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.PL	1 Aug 2007 14:31:35 -0000	1.3
+++ Makefile.PL	2 Aug 2007 06:43:09 -0000	1.4
@@ -89,7 +89,7 @@
 
 PACKAGE = \$(shell [ -r \"kolabconf.spec\" ] && grep '%define[ ]*V_package' kolabconf.spec | sed -e 's/.*V_package\\s*\\([a-z\\-\\_]*\\).*/\\1/')
 VERSION = \$(shell [ -r \"kolabconf.spec\" ] && grep '%define[ ]*V_version' kolabconf.spec | sed -e 's/.*V_version\\s*\\([0-9.]*\\).*/\\1/')
-RELEASE = \$(shell date '+%Y%m%d')
+RELEASE = \$(shell [ -r \"kolabconf.spec\" ] && grep '%define[ ]*V_release' kolabconf.spec | sed -e 's/.*V_release\\s*\\([0-9.]*\\).*/\\1/')
 
 clean_all: veryclean
 	rm -rf bin/kolabconf

Index: kolabconf.spec
===================================================================
RCS file: /kolabrepository/server/kolabconf/kolabconf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolabconf.spec	1 Aug 2007 14:31:35 -0000	1.3
+++ kolabconf.spec	2 Aug 2007 06:43:09 -0000	1.4
@@ -27,7 +27,7 @@
 %define       V_perl         5.8.8
 %define       V_package      kolabconf
 %define       V_version      2.1.99
-%define       V_release      %(date '+%%Y%%m%%d')
+%define       V_release      20070801
 
 #   package information
 Name:         %{V_package}