thomas: server/openpkg .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 README, NONE, 1.1 kolab.patch, NONE, 1.1

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server/openpkg
In directory doto:/tmp/cvs-serv3975/openpkg

Added Files:
	.cvsignore Makefile README kolab.patch 
Log Message:
Fix kolab/issue2871 (openpkg-20071227-20071227 does not compile with gcc 4.3)


--- NEW FILE: .cvsignore ---
*.src.rpm
openpkg-*.sh

--- NEW FILE: Makefile ---
ifeq "x$(KOLABPKGURI)" "x"
	KOLABPKGURI = http://files.kolab.org/server/release/kolab-server-2.2.0/sources/
endif
ifeq "x$(KOLABRPMSRC)" "x"
	KOLABRPMSRC = $(HOME)/RPM/SRC
endif
ifeq "x$(KOLABRPMPKG)" "x"
	KOLABRPMPKG = $(HOME)/RPM/PKG
endif
ifeq "x$(KOLABCVSDIR)" "x"
	KOLABCVSDIR = $(CURDIR)
endif
ifeq "x$(RPM)" "x"
	RPM = $(HOME)/bin/openpkg rpm
endif

PACKAGE=openpkg
VERSION=20071227
RELEASE=20071227
KOLABRELEASE=$(RELEASE)_kolab1

KOLABPKGURI2 = http://files.kolab.org/server/development-2.2/openpkg-orig-srpms/
PACKAGE2=tar
VERSION2=1.22
RELEASE2=20090305

all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh

$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(KOLABCVSDIR)/kolab.patch Makefile $(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm
	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
	$(RPM) -ihv $(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm

	cd $(KOLABRPMSRC)/$(PACKAGE) && patch -p1 < $(KOLABCVSDIR)/kolab.patch && rm $(PACKAGE2)-*.tar.gz && cp ../$(PACKAGE2)/$(PACKAGE2)-${VERSION2}.tar.gz ../$(PACKAGE2)/$(PACKAGE2).patch . && ./openpkg.boot -s
	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh $(KOLABCVSDIR)

$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

$(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm:
	wget -c $(KOLABPKGURI2)/$(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm

dist: all
	cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh ../stage/

clean:
	rm -f $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh

--- NEW FILE: README ---
Fix kolab/issue2871 (openpkg-20071227-20071227 does not compile with gcc 4.3)

This is done by replacing the embedded tar 1.19 with 1.22, including tar.patch
taken from the updated OpenPKG tar package.

--- NEW FILE: kolab.patch ---
diff -urN openpkg.orig/openpkg.boot openpkg/openpkg.boot
--- openpkg.orig/openpkg.boot	2007-07-18 19:47:35.000000000 +0200
+++ openpkg/openpkg.boot	2009-03-26 14:20:04.566281335 +0100
@@ -142,7 +142,7 @@
 name="openpkg"
 spec="$name.spec"
 version=`grep V_openpkg $spec | sed -e 'q' | awk '{ printf("%s", $3); }'`
-release="$version"
+release=`grep V_release $spec | sed -e 'q' | awk '{ printf("%s", $3); }'`
 
 ##
 ##  display headline
diff -urN openpkg.orig/openpkg.spec openpkg/openpkg.spec
--- openpkg.orig/openpkg.spec	2007-12-27 11:41:34.000000000 +0100
+++ openpkg/openpkg.spec	2009-03-26 14:20:39.026995207 +0100
@@ -40,6 +40,7 @@
 
 #   the package version/release
 %define       V_openpkg  20071227
+%define       V_release  20071227_kolab1
 
 #   the used software versions
 %define       V_rpm      4.2.1
@@ -51,7 +52,7 @@
 %define       V_gzip     1.3.12
 %define       V_gzip_r   1.13
 %define       V_patch    2.5.9
-%define       V_tar      1.19
+%define       V_tar      1.22
 %define       V_bash     3.2
 %define       V_uuid     1.6.0
 %define       V_config   20060923
@@ -72,7 +73,7 @@
 Group:        Bootstrapping
 License:      MIT/BSD/LGPL/GPL
 Version:      %{V_openpkg}
-Release:      %{V_openpkg}
+Release:      %{V_release}
 
 #   list of sources
 Source0:      ftp://alpha.gnu.org/gnu/patch/patch-%{V_patch}.tar.gz