gunnar: server/kolabconf Makefile.PL,1.5,1.6 kolabconf.spec,1.6,1.7

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	Makefile.PL kolabconf.spec 
Log Message:
Version numbering fixes for kolabconf.

Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/kolabconf/Makefile.PL,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.PL	13 Aug 2007 06:49:41 -0000	1.5
+++ Makefile.PL	13 Aug 2007 07:11:38 -0000	1.6
@@ -5,6 +5,25 @@
 use ExtUtils::MakeMaker;
 use Getopt::Long;
 
+my $VERSION;
+my $KOLAB_VERSION;
+
+# The Kolab version number for the perl-kolab package
+my $KOLAB_BASE_VERSION = "2.1.0";
+
+# Are current releases cvs based or is this a real release?
+my $KOLAB_CVS = 1;
+
+my $KOLAB_RELEASE = sprintf "%0004d%02d%02d", ((gmtime)[5] + 1900), ((gmtime)[4] + 1), (gmtime)[3];
+
+if ($KOLAB_CVS) {
+    $KOLAB_VERSION = $KOLAB_BASE_VERSION . "_cvs";
+    $VERSION = $KOLAB_VERSION . "-" . $KOLAB_RELEASE;
+} else {
+    $KOLAB_VERSION = $KOLAB_BASE_VERSION;
+    $VERSION = $KOLAB_VERSION;
+}
+
 my $HELP = 0;
 my $CONFIG = '/kolab/etc/kolab/kolab.globals';
 my $INSTALLSCRIPT = '/kolab/sbin';
@@ -73,28 +92,30 @@
     my $add = ".PHONY: bin/kolabconf
 bin/kolabconf: bin/kolabconf.in
 	cat \$< | sed -e 's#\@CONFIG_FILE@#$CONFIG#' > \$@
+	cat \$< | sed -e 's#\@VERSION@#$VERSION#' > \$@
 
 ifeq \"x\$(RPM)\" \"x\"
   RPM = \$(HOME)/bin/openpkg rpm
 endif
 ifeq \"x\$(KOLABRPMSRC)\" \"x\"
-  KOLABRPMSRC = /kolab/RPM/SRC
+  KOLABRPMSRC = \$(HOME)/RPM/SRC
 endif
 ifeq \"x\$(KOLABRPMPKG)\" \"x\"
-  KOLABRPMPKG = /kolab/RPM/PKG
+  KOLABRPMPKG = \$(HOME)/RPM/PKG
 endif
 ifeq \"x\$(KOLABRPMTMP)\" \"x\"
-  KOLABRPMTMP = /kolab/RPM/TMP
+  KOLABRPMTMP = \$(HOME)/RPM/TMP
 endif
 
 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 [ -r \"kolabconf.spec\" ] && grep '%define[ ]*V_release' kolabconf.spec | sed -e 's/.*V_release\\s*\\([0-9.]*\\).*/\\1/')
+VERSION = $KOLAB_VERSION
+RELEASE = $KOLAB_RELEASE
+SOURCE_TAG = $VERSION
 
 clean_all: veryclean
 	rm -rf bin/kolabconf
 	rm -rf \$(KOLABRPMTMP)/\$(PACKAGE)
-	rm -rf \$(PACKAGE)-\$(VERSION)-\$(RELEASE).src.rpm
+	rm -rf *.src.rpm
 	rm -rf *.tar.gz
 	rm -rf *~
 
@@ -103,8 +124,12 @@
 
 \$(PACKAGE)-\$(VERSION)-\$(RELEASE).src.rpm: \$(PACKAGE).spec
 	test -d \$(KOLABRPMSRC)/\$(PACKAGE) || mkdir \$(KOLABRPMSRC)/\$(PACKAGE)
-	cp \$(PACKAGE).spec \$(KOLABRPMSRC)/\$(PACKAGE)
-	cp \$(PACKAGE)-\$(VERSION).tar.gz \$(KOLABRPMSRC)/\$(PACKAGE)
+	cp \$(PACKAGE).spec \$(PACKAGE).spec.tmp
+	sed -i -e 's/\@VERSION\@/\$(VERSION)/' \$(PACKAGE).spec.tmp
+	sed -i -e 's/\@RELEASE\@/\$(RELEASE)/' \$(PACKAGE).spec.tmp
+	sed -i -e 's/\@SOURCE_TAG\@/\$(SOURCE_TAG)/' \$(PACKAGE).spec.tmp
+	mv \$(PACKAGE).spec.tmp \$(KOLABRPMSRC)/\$(PACKAGE)/\$(PACKAGE).spec
+	cp \$(PACKAGE)-\$(SOURCE_TAG).tar.gz \$(KOLABRPMSRC)/\$(PACKAGE)
 	cd \$(KOLABRPMSRC)/\$(PACKAGE) && \$(RPM) -ba \$(PACKAGE).spec
 	cp -p \$(KOLABRPMPKG)/\$(PACKAGE)-\$(VERSION)-\$(RELEASE).src.rpm .
 
@@ -113,12 +138,9 @@
     return $add;
 }
 
-use lib "lib/Kolab";
-require "Conf.pm";
-
 WriteMakefile(
     NAME              => 'kolabconf',
-    VERSION           => $Kolab::Conf::VERSION,
+    VERSION           => $VERSION,
     INSTALLDIRS       => 'vendor',
     EXE_FILES         => [ 'bin/kolabconf', ],
     INSTALLSCRIPT     => $INSTALLSCRIPT,

Index: kolabconf.spec
===================================================================
RCS file: /kolabrepository/server/kolabconf/kolabconf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolabconf.spec	13 Aug 2007 06:35:35 -0000	1.6
+++ kolabconf.spec	13 Aug 2007 07:11:38 -0000	1.7
@@ -26,8 +26,9 @@
 #   versions of individual parts
 %define       V_perl         5.8.8
 %define       V_package      kolabconf
-%define       V_version      2.1.99
-%define       V_release      20070802
+%define       V_version      @VERSION@
+%define       V_release      @RELEASE@
+%define       V_source_tag   @SOURCE_TAG@
 
 #   package information
 Name:         %{V_package}
@@ -43,12 +44,12 @@
 Release:      %{V_release}
 
 #   list of sources
-Source0:      %{V_package}-%{V_version}.tar.gz
+Source0:      %{V_package}-%{V_source_tag}.tar.gz
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20040130, perl >= %{V_perl}, perl-openpkg >= %{V_perl}-20040126
+BuildPreReq:  OpenPKG, openpkg >= 20040130, perl >= %{V_perl}, perl-openpkg >= %{V_perl}-20040126, perl-kolab
 PreReq:       OpenPKG, openpkg >= 20040130, perl >= %{V_perl}, perl-kolab
 AutoReq:      no
 AutoReqProv:  no