gunnar: server/php-kolab DEVELOPMENT, NONE, 1.1 Makefile, 1.3, 1.4 php-kolab.spec, 1.2, 1.3 ChangeLog, 1.1, NONE
cvs at kolab.org
cvs at kolab.org
Mon Aug 13 16:14:15 CEST 2007
- Previous message: gunnar: server/php-kolab/Kolab_Filter .cvsignore, NONE, 1.1 ChangeLog, NONE, 1.1 package.xml.in, NONE, 1.1 package.xml, 1.1, NONE
- Next message: gunnar: server/php-kolab/Kolab_Freebusy .cvsignore, NONE, 1.1 ChangeLog, NONE, 1.1 package.xml.in, NONE, 1.1 package.xml, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: gunnar
Update of /kolabrepository/server/php-kolab
In directory doto:/tmp/cvs-serv20730
Modified Files:
Makefile php-kolab.spec
Added Files:
DEVELOPMENT
Removed Files:
ChangeLog
Log Message:
Two third of this package are complete but not yet well tested. Versioning has been fixed and development guidelines added.
--- NEW FILE: DEVELOPMENT ---
Development notes
=================
The php-kolab package provides PEAR-style PHP packages as suporting
libraries for kolab-freebusy, kolab-filter and kolab-webadmin.
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 *.tar.gz packages that can be distributed
as source packages. The same run will produce a php-kolab-*.src.rpm
package that is suited for installation on an OpenPKG system.
Version numbering
=================
php-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.
Released source packages will look like this:
Kolab_*-2.1.0.tar.gz
Released source RPMs will look like this:
php-kolab-2.1.0-20070813.src.rpm
A NEW VERSION HAS TO BE SET IN
Makefile
Once development picks up after a release, please switch the CVS
variable in "Makefile" to "1":
CVS = 1
Source packages will then look like this:
Kolab_*-2.1.0.20070815tar.gz
Source RPMs will be named similar:
php-kolab-2.1.0_cvs-20070815.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 parameter
needs to be switched to "0" again.
Once releasing a new package you should copy the relevant section from
Kolab_*/ChangeLog into Kolab_*/package.xml.in.
Change log
==========
The change log for each package is provided in
"Kolab_*/ChangeLog". 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
"Kolab_*/package.xml.in". Please keep this file up-to-date if you
change the source code of this package.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 8 Aug 2007 16:31:21 -0000 1.3
+++ Makefile 13 Aug 2007 14:14:13 -0000 1.4
@@ -1,12 +1,21 @@
PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([a-z\_-]*\).*/\1/")
-VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
-RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+RELEASE = $(shell date '+%Y%m%d')
+DATE = $(shell date '+%Y-%m-%d')
+
+VERSION = 2.1.0
+CVS = 1
+
+ifeq "x$(CVS)" "x0"
+ SOURCE_TAG = $(VERSION)
+else
+ SOURCE_TAG = $(VERSION).$(RELEASE)
+endif
MODULES = Kolab_Freebusy \
Kolab_Filter \
#Kolab_Webadmin
-SOURCES = $(MODULES:%=%-$(VERSION).tgz)
+SOURCES = $(MODULES:%=%-$(SOURCE_TAG).tgz)
ifeq "x$(RPM)" "x"
RPM = $(HOME)/bin/openpkg rpm
@@ -30,23 +39,35 @@
.PHONY: clean
clean:
- rm -rf /kolab/RPM/TMP/Kolab_Freebusy*
- rm -rf /kolab/RPM/TMP/Kolab_Filter*
- rm -rf /kolab/RPM/TMP/Kolab_Webadmin*
- rm -rf /kolab/RPM/TMP/$(PACKAGE)
+ for MODULE in $(MODULES); do \
+ rm -rf $(HOME)/RPM/TMP/$${MODULE}*; \
+ rm -rf $$MODULE/package.xml; \
+ done
+ rm -rf $(HOME)/RPM/TMP/$(PACKAGE)
find . -name "*~" | xargs rm -rf
rm -rf *.src.rpm
rm -rf *.tgz
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog $(SOURCES)
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(SOURCES)
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cp $(SOURCES) $(KOLABRPMSRC)/$(PACKAGE)/
- cp $(PACKAGE).spec $(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
+
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
$(SOURCES):
- $(HOME)/bin/pear package $(@:%-$(VERSION).tgz=%)/package.xml
+ cat $(@:%-$(SOURCE_TAG).tgz=%)/package.xml.in | \
+ sed -e "s/@FULL_VERSION@/$(SOURCE_TAG)/" | \
+ sed -e "s/@API_VERSION@/$(VERSION)/" | \
+ sed -e "s/@DATE@/$(DATE)/" \
+ > $(@:%-$(SOURCE_TAG).tgz=%)/package.xml
+
+ $(HOME)/bin/pear package $(@:%-$(SOURCE_TAG).tgz=%)/package.xml
Index: php-kolab.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/php-kolab.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- php-kolab.spec 8 Aug 2007 16:31:21 -0000 1.2
+++ php-kolab.spec 13 Aug 2007 14:14:13 -0000 1.3
@@ -1,7 +1,8 @@
# Variables
%define V_package php-kolab
-%define V_version 2.1.99
-%define V_release 20070808
+%define V_version @VERSION@
+%define V_release @RELEASE@
+%define V_source_tag @SOURCE_TAG@
# Package Information
Name: %{V_package}
@@ -17,9 +18,9 @@
Release: %{V_release}
# List of Sources
-Source0: Kolab_Freebusy-%{V_version}.tgz
-Source1: Kolab_Filter-%{V_version}.tgz
-#Source2: Kolab_Webadmin-%{V_version}.tgz
+Source0: Kolab_Freebusy-%{V_source_tag}.tgz
+Source1: Kolab_Filter-%{V_source_tag}.tgz
+#Source2: Kolab_Webadmin-%{V_source_tag}.tgz
# Build Info
Prefix: %{l_prefix}
@@ -56,11 +57,11 @@
%install
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
- %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/Kolab_Freebusy-%{V_version}.tgz
+ %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/Kolab_Freebusy-%{V_source_tag}.tgz
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
- %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/Kolab_Filter-%{V_version}.tgz
+ %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/Kolab_Filter-%{V_source_tag}.tgz
# env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
# PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
--- ChangeLog DELETED ---
- Previous message: gunnar: server/php-kolab/Kolab_Filter .cvsignore, NONE, 1.1 ChangeLog, NONE, 1.1 package.xml.in, NONE, 1.1 package.xml, 1.1, NONE
- Next message: gunnar: server/php-kolab/Kolab_Freebusy .cvsignore, NONE, 1.1 ChangeLog, NONE, 1.1 package.xml.in, NONE, 1.1 package.xml, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list