gunnar: server/openpkg .cvsignore, 1.1, 1.2 Makefile, 1.1, 1.2 kolab.patch, 1.1, 1.2
cvs at kolab.org
cvs at kolab.org
Tue Jan 5 17:24:57 CET 2010
Author: gunnar
Update of /kolabrepository/server/openpkg
In directory doto:/tmp/cvs-serv25158/openpkg
Modified Files:
.cvsignore Makefile kolab.patch
Log Message:
MFB: Fixed cflags for amd64 systems. Related to: kolab/issue2982 (OpenLDAP segmentation fault on 64bit). In addition: Updated build system to use the make helper scripts.
Index: .cvsignore
===================================================================
RCS file: /kolabrepository/server/openpkg/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore 26 Mar 2009 14:26:42 -0000 1.1
+++ .cvsignore 5 Jan 2010 16:24:55 -0000 1.2
@@ -1,2 +1,4 @@
*.src.rpm
openpkg-*.sh
+*.tar.gz
+tar.patch
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/openpkg/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 26 Mar 2009 14:26:42 -0000 1.1
+++ Makefile 5 Jan 2010 16:24:55 -0000 1.2
@@ -1,46 +1,41 @@
-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
+OPENPKGURI=http://files.kolab.org/server/release/kolab-server-2.2.0/sources/
+
+include ../make-helper/kolab.mk
PACKAGE=openpkg
+DOWNLOAD_VERSION=20071227
+OPENPKG_RELEASE=20071227
VERSION=20071227
-RELEASE=20071227
-KOLABRELEASE=$(RELEASE)_kolab1
+RELEASE=$(OPENPKG_RELEASE)_kolab2
+
+SOURCE_URL=
+SOURCE_0=
+
+PATCHES=
+
+EXTRA=$(PATCHES) kolab.patch $(PACKAGE2)-${VERSION2}.tar.gz $(PACKAGE2).patch
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
+RELEASETARGET=$(PACKAGE)-$(VERSION)-$(RELEASE).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
+include ../make-helper/package.mk
+include ../make-helper/openpkg-patched.mk
- 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)
+$(KOLABRPMPKG)/$(RELEASETARGET): $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm
+ cd $(KOLABRPMSRC)/$(PACKAGE) && rm $(PACKAGE2)-*.tar.gz && ./openpkg.boot -s
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
- wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+$(PACKAGE2).patch: $(KOLABRPMSRC)/$(PACKAGE2)
+ cp $(KOLABRPMSRC)/$(PACKAGE2)/$(PACKAGE2).patch .
-$(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm:
- wget -c $(KOLABPKGURI2)/$(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm
+$(PACKAGE2)-${VERSION2}.tar.gz: $(KOLABRPMSRC)/$(PACKAGE2)
+ cp $(KOLABRPMSRC)/$(PACKAGE2)/$(PACKAGE2)-${VERSION2}.tar.gz .
-dist: all
- cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh ../stage/
+$(KOLABRPMSRC)/$(PACKAGE2): $(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm
+ $(RPM) -ihv $(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm
-clean:
- rm -f $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.sh
+$(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm:
+ wget -c $(KOLABPKGURI2)/$(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm
Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/openpkg/kolab.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab.patch 26 Mar 2009 14:26:42 -0000 1.1
+++ kolab.patch 5 Jan 2010 16:24:55 -0000 1.2
@@ -1,6 +1,6 @@
-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
+diff -urN openpkg/openpkg.boot openpkg-kolab/openpkg.boot
+--- openpkg/openpkg.boot 2007-07-18 19:47:35.000000000 +0200
++++ openpkg-kolab/openpkg.boot 2009-09-23 15:09:39.603405000 +0200
@@ -142,7 +142,7 @@
name="openpkg"
spec="$name.spec"
@@ -10,14 +10,14 @@
##
## 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
+diff -urN openpkg/openpkg.spec openpkg-kolab/openpkg.spec
+--- openpkg/openpkg.spec 2007-12-27 11:41:34.000000000 +0100
++++ openpkg-kolab/openpkg.spec 2009-09-23 15:09:39.603405000 +0200
@@ -40,6 +40,7 @@
# the package version/release
%define V_openpkg 20071227
-+%define V_release 20071227_kolab1
++%define V_release 20071227_kolab2
# the used software versions
%define V_rpm 4.2.1
@@ -39,3 +39,15 @@
# list of sources
Source0: ftp://alpha.gnu.org/gnu/patch/patch-%{V_patch}.tar.gz
+diff -urN openpkg/rpmtool openpkg-kolab/rpmtool
+--- openpkg/rpmtool 2007-10-11 22:40:43.000000000 +0200
++++ openpkg-kolab/rpmtool 2009-09-23 15:45:25.946152864 +0200
+@@ -475,7 +475,7 @@
+ # more than required. We also can assume that the C
+ # compiler is always GCC, either the OpenPKG one or
+ # the FreeBSD one.
+- cflags="-fPIC"
++ cflags="-fPIC $cflags"
+ ;;
+ esac
+ echo "x$cflags" | sed -e 's;^x;;'
More information about the commits
mailing list