wilde: server/db .cvsignore, NONE, 1.1.2.1 Makefile, NONE, 1.5.2.1 kolab.patch, NONE, 1.2.2.1

[cvs at kolab.org]

Author: wilde

Update of /kolabrepository/server/db
In directory doto:/tmp/cvs-serv17006/db

Added Files:
      Tag: kolab_2_2_branch
	.cvsignore Makefile kolab.patch 
Log Message:
Added db package to build process, so it can be patched.
We patch the package, so that more sensible mutex code is used on amd64,
this should fix kolab/issue2982 (OpenLDAP segmentation fault on 64bit)

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

--- 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=db
VERSION=4.5.20.2
RELEASE=20070628
KOLABRELEASE=20070628_kolab1

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

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

	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec
	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)

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

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

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

--- NEW FILE: kolab.patch ---
diff -urN db.orig/db.spec db/db.spec
--- db.orig/db.spec	2007-06-28 00:03:05.000000000 +0200
+++ db/db.spec	2009-09-23 18:09:09.503979301 +0200
@@ -37,7 +37,7 @@
 Group:        Database
 License:      BSD
 Version:      %{V_version}.%{V_revision}
-Release:      20070628
+Release:      20070628_kolab1
 
 #   package options
 %option       with_compat no
@@ -91,6 +91,7 @@
     case "%{l_platform -p}" in
         ix86-*   ) mutex="x86/gcc-assembly"   ;;
         ia64-*   ) mutex="ia64/gcc-assembly"  ;;
+        amd64-*  ) mutex="x86_64/gcc-assembly" ;;
         sparc*-* ) mutex="Sparc/gcc-assembly" ;;
         ppc*-*   ) mutex="PPC/gcc-assembly"   ;;
         alpha*-* ) mutex="ALPHA/gcc-assembly" ;;