wilde: server/openpkg Makefile, 1.1.2.1, 1.1.2.2 kolab.patch, 1.1.2.1, 1.1.2.2

[cvs at kolab.org]

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	Makefile kolab.patch 
Log Message:
Fixed rpmtool to issue optimization flags an amd64 systems.
This is needed to build rpm packages with optimization on all x86-64 systems,
also see kolab/issue3868.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/openpkg/Makefile,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- Makefile	26 Mar 2009 14:40:05 -0000	1.1.2.1
+++ Makefile	23 Sep 2009 15:46:01 -0000	1.1.2.2
@@ -17,7 +17,7 @@
 PACKAGE=openpkg
 VERSION=20071227
 RELEASE=20071227
-KOLABRELEASE=$(RELEASE)_kolab1
+KOLABRELEASE=$(RELEASE)_kolab2
 
 KOLABPKGURI2 = http://files.kolab.org/server/development-2.2/openpkg-orig-srpms/
 PACKAGE2=tar

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/openpkg/kolab.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- kolab.patch	26 Mar 2009 14:40:05 -0000	1.1.2.1
+++ kolab.patch	23 Sep 2009 15:46:01 -0000	1.1.2.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;;'