gunnar: server/perl-kolab AUTHORS, 1.2, 1.3 DEVELOPMENT, 1.2, 1.3 Makefile.PL, 1.2, 1.3 perl-kolab.spec, 1.100, 1.101
cvs at kolab.org
cvs at kolab.org
Fri Aug 10 16:52:02 CEST 2007
Author: gunnar
Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv2287
Modified Files:
AUTHORS DEVELOPMENT Makefile.PL perl-kolab.spec
Log Message:
Modified release scheme for perl-kolab
Index: AUTHORS
===================================================================
RCS file: /kolabrepository/server/perl-kolab/AUTHORS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- AUTHORS 1 Aug 2007 14:57:41 -0000 1.2
+++ AUTHORS 10 Aug 2007 14:51:59 -0000 1.3
@@ -18,11 +18,10 @@
Portions based on work by the following companies:
- (c) 2003 Code Fusion cc
(c) 2004 - 2006 Klaraelvdalens Datakonsult AB
(c) 2007 Intevation GmbH
(c) 2006 - 2007 p at rdus
- (c) 2003 - 2007 Erfrakon
+ (c) 2003 - 2007 erfrakon Partnerschaftsgesellschaft
Contributions by the following people:
Index: DEVELOPMENT
===================================================================
RCS file: /kolabrepository/server/perl-kolab/DEVELOPMENT,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DEVELOPMENT 2 Aug 2007 06:46:22 -0000 1.2
+++ DEVELOPMENT 10 Aug 2007 14:51:59 -0000 1.3
@@ -1,40 +1,68 @@
Development notes
=================
-The kolabconf package is a standard perl package meant to be handled
-with the Makefile.PL script.
+The perl-kolab package is a standard perl package meant to be handled
+with the Makefile.PL script. You will receive a standard "Makefile" by
+running "perl Makefile.PL".
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
+"dist" target will produce a perl-kolab-*.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
+perl-kolab-*.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.
+perl-kolab 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.
-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.
+Released source packages will look like this:
-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.
+ perl-kolab-2.1.0.tar.gz
-A NEW VERSION HAS TO BE SET IN BOTH
+Released source RPMs will look like this:
+
+ perl-kolab-2.1.0-20070819.src.rpm
+
+A NEW VERSION HAS TO BE SET IN
lib/Kolab.pm
-AND
+Once development picks up after a release, please set
- perl-kolab.spec
+my $KOLAB_CVS = 1;
-For testing purposes the "dist" target will produce source RPM
-packages that have the release number from perl-kolab.spec
-attached. You will have to update this release number manually.
\ No newline at end of file
+in lib/Kolab.pm.
+
+The version number will then receive the suffix "_cvs" and the current
+date will be appended.
+
+Source packages will then look like this:
+
+ perl-kolab-2.1.0_cvs-20070810.tar.gz
+
+Source RPMs will be named similar:
+
+ perl-kolab-2.1.0_cvs-20070810.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) and the CVS switch needs to
+be reversed:
+
+my $KOLAB_CVS = 0;
+
+
+Change log
+==========
+
+The change log for the package is provided in "Changes". Please keep
+this file up-to-date if you change the source code of this package.
+
+Contributors
+============
+
+The developers of this package are listed in "AUTHORS". Please keep
+this file up-to-date if you change the source code of this package.
Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Makefile.PL,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.PL 2 Aug 2007 06:46:22 -0000 1.2
+++ Makefile.PL 10 Aug 2007 14:51:59 -0000 1.3
@@ -42,22 +42,23 @@
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 \"perl-kolab.spec\" ] && grep '%define[ ]*V_package' perl-kolab.spec | sed -e 's/.*V_package\\s*\\([a-z\\_-]*\\).*/\\1/')
-VERSION = \$(shell [ -r \"perl-kolab.spec\" ] && grep '%define[ ]*V_version' perl-kolab.spec | sed -e 's/.*V_version\\s*\\([0-9.]*\\).*/\\1/')
-RELEASE = \$(shell [ -r \"perl-kolab.spec\" ] && grep '%define[ ]*V_release' perl-kolab.spec | sed -e 's/.*V_release\\s*\\([0-9.]*\\).*/\\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_all: veryclean
rm -rf \$(KOLABRPMTMP)/\$(PACKAGE)
- rm -rf \$(PACKAGE)-\$(VERSION)-\$(RELEASE).src.rpm
+ rm -rf *.src.rpm
rm -rf *.tar.gz
rm -rf *~
@@ -66,8 +67,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 .
@@ -76,9 +81,12 @@
return $add;
}
+use lib "lib";
+require "Kolab.pm";
+
WriteMakefile(
NAME => 'perl-kolab',
- VERSION_FROM => 'lib/Kolab.pm',
+ VERSION => $Kolab::VERSION,
INSTALLDIRS => 'vendor',
ABSTRACT =>
'perl-kolab provides a basic set of perl modules required for the
Index: perl-kolab.spec
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- perl-kolab.spec 2 Aug 2007 08:09:06 -0000 1.100
+++ perl-kolab.spec 10 Aug 2007 14:51:59 -0000 1.101
@@ -26,8 +26,9 @@
# versions of individual parts
%define V_perl 5.8.8
%define V_package perl-kolab
-%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,7 +44,7 @@
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}
@@ -69,7 +70,6 @@
%build
%install
- rm -rf $RPM_BUILD_ROOT
%{l_prefix}/bin/perl-openpkg prepare
%{l_prefix}/bin/perl-openpkg -d %{SOURCE0} configure build install
%{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
More information about the commits
mailing list