gunnar: server/kolabconf DEVELOPMENT, NONE, 1.1 AUTHORS, 1.1, 1.2 Changes, 1.1, 1.2 Makefile.PL, 1.2, 1.3 kolabconf.spec, 1.2, 1.3

cvs at kolab.org cvs at kolab.org
Wed Aug 1 16:31:37 CEST 2007


Author: gunnar

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

Modified Files:
	AUTHORS Changes Makefile.PL kolabconf.spec 
Added Files:
	DEVELOPMENT 
Log Message:
Some minor fixes to the new package and some more comments.

--- NEW FILE: DEVELOPMENT ---
Development notes
=================

The kolabconf package is a standard perl package meant to be handled
with the Makefile.PL script.

The Kolab Server packages were usually not released as source
packages. This should be changed with this new package layout. The
"dist" target will produce a kolabconf-*.tar.gz package that can be
distributed as source package. The same run will produce a
kolabconf-*.src.rpm package that is suited for installation on an
OpenPKG system.

Version numbering
=================

kolabconf 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.

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.

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.

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.
Index: AUTHORS
===================================================================
RCS file: /kolabrepository/server/kolabconf/AUTHORS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- AUTHORS	1 Aug 2007 10:38:32 -0000	1.1
+++ AUTHORS	1 Aug 2007 14:31:35 -0000	1.2
@@ -1,7 +1,7 @@
 Originally written by Stuart Bingë <s.binge at codefusion.co.za>
 
-  Copyright (c) 2003  Stuart Bingë
-  Copyright (c) 2003  Code Fusion cc
+  Copyright (c) 2003 - 2004  Stuart Bingë
+  Copyright (c) 2003 - 2004  Code Fusion cc
 
 Portions based on work by the following people:
 

Index: Changes
===================================================================
RCS file: /kolabrepository/server/kolabconf/Changes,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Changes	1 Aug 2007 10:38:32 -0000	1.1
+++ Changes	1 Aug 2007 14:31:35 -0000	1.2
@@ -1,3 +1,9 @@
+2007-08-01    Gunnar Wrobel  <p at rdus.de>
+
+	Created the kolabconf package by moving kolabconf and the
+	Conf.pm perl module into one package. The package is now a
+	clean perl package.
+
 2007-07-31    Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab-Conf/Conf.pm.in:

Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/kolabconf/Makefile.PL,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.PL	1 Aug 2007 12:34:31 -0000	1.2
+++ Makefile.PL	1 Aug 2007 14:31:35 -0000	1.3
@@ -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 [ -r \"kolabconf.spec\" ] && grep '%define[ ]*V_release' kolabconf.spec | sed -e 's/.*V_release\\s*\\([0-9]*\\).*/\\1/')
+RELEASE = \$(shell date '+%Y%m%d')
 
 clean_all: veryclean
 	rm -rf bin/kolabconf

Index: kolabconf.spec
===================================================================
RCS file: /kolabrepository/server/kolabconf/kolabconf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolabconf.spec	1 Aug 2007 12:34:31 -0000	1.2
+++ kolabconf.spec	1 Aug 2007 14:31:35 -0000	1.3
@@ -26,8 +26,8 @@
 #   versions of individual parts
 %define       V_perl         5.8.8
 %define       V_package      kolabconf
-%define       V_version      1.0
-%define       V_release      20070801
+%define       V_version      2.1.99
+%define       V_release      %(date '+%%Y%%m%%d')
 
 #   package information
 Name:         %{V_package}
@@ -67,7 +67,7 @@
 %install
     rm -rf $RPM_BUILD_ROOT
     %{l_prefix}/bin/perl-openpkg prepare
-    %{l_prefix}/bin/perl-openpkg -d %{SOURCE0} -v -A "--config \"%{l_prefix}/etc/kolab/kolab.globals\" --bin \"%{l_prefix}/sbin\"" configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE0} -A "--config \"%{l_prefix}/etc/kolab/kolab.globals\" --bin \"%{l_prefix}/sbin\"" configure build install
     %{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} `cat perl-openpkg-files`
 





More information about the commits mailing list