gunnar: server/perl-kolab ChangeLog, 1.56.2.4, 1.56.2.5 Makefile.PL, 1.14.2.3, 1.14.2.4

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv15068/perl-kolab

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog Makefile.PL 
Log Message:
 kolab/issue3952 (Version in kolabconf is not replaced in the build process)

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/perl-kolab/ChangeLog,v
retrieving revision 1.56.2.4
retrieving revision 1.56.2.5
diff -u -d -r1.56.2.4 -r1.56.2.5
--- ChangeLog	17 Nov 2009 17:12:35 -0000	1.56.2.4
+++ ChangeLog	24 Nov 2009 18:57:08 -0000	1.56.2.5
@@ -1,3 +1,8 @@
+2009-11-24  Gunnar Wrobel <wrobel at pardus.de>
+
+	* Makefile.PL: kolab/issue3952 (Version in kolabconf is not
+	replaced in the build process)
+
 2009-11-17 Gunnar Wrobel <wrobel at pardus.de>
 
 	* bin/kolabpasswd.in: kolab/issue919 (kolab server has problems

Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.PL,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -u -d -r1.14.2.3 -r1.14.2.4
--- Makefile.PL	9 Nov 2009 17:08:44 -0000	1.14.2.3
+++ Makefile.PL	24 Nov 2009 18:57:08 -0000	1.14.2.4
@@ -102,11 +102,18 @@
     }
     my $add = "include kolab.mk
 
+PACKAGE = \$(shell [ -r \"perl-kolab.spec\" ] && grep '%define[ ]*V_package' perl-kolab.spec | sed -e 's/.*V_package\\s*\\([a-z\\_-]*\\).*/\\1/')
+VERSION = \$(shell perl -I lib -e 'use Kolab;print \$\$Kolab::KOLAB_VERSION;')
+RELEASE = \$(shell perl -I lib -e 'use Kolab;print \$\$Kolab::KOLAB_RELEASE;')
+SOURCE_TAG = \$(shell perl -I lib -e 'use Kolab;print \$\$Kolab::VERSION;')
+
 bin/%: bin/%.in
 	cat \$< | sed -e 's#\@CONFIG_DIR@#$CONFIG#g' > \$@
 
 sbin/%: sbin/%.in
-	cat \$< | sed -e 's#\@CONFIG_DIR@#$CONFIG#g' > \$@
+	cat \$< | sed -e 's#\@CONFIG_DIR@#$CONFIG#g' > \$@.tmp
+	cat \$@.tmp | sed -e 's#\@VERSION@#\$(VERSION)#g' > \$@
+	rm \$@.tmp
 	\$(FIXIN) \$@
 
 SBIN_TARGETS=sbin/kolabconf sbin/kolab_bootstrap sbin/kolabd sbin/kolabcheckperm
@@ -127,11 +134,6 @@
 ifeq \"x\$(PLATTAG)\" \"x\"
 	PLATTAG = \$(shell \$(RPM) -q --qf=\"%{ARCH}-%{OS}\" openpkg)-\$(KOLABDIR:/%=%)
 endif
-
-PACKAGE = \$(shell [ -r \"perl-kolab.spec\" ] && grep '%define[ ]*V_package' perl-kolab.spec | sed -e 's/.*V_package\\s*\\([a-z\\_-]*\\).*/\\1/')
-VERSION = \$(shell perl -I lib -e 'use Kolab;print \$\$Kolab::KOLAB_VERSION;')
-RELEASE = \$(shell perl -I lib -e 'use Kolab;print \$\$Kolab::KOLAB_RELEASE;')
-SOURCE_TAG = \$(shell perl -I lib -e 'use Kolab;print \$\$Kolab::VERSION;')
 
 clean_tardist:
 	rm -rf *.tar.gz