From: Jan Rękorajski <baggins@pld-linux.org>
Date: Thu, 6 Sep 2012 10:40:14 +0000 (+0200)
Subject: - fix building with db 5.3
X-Git-Tag: auto/th/ice-3.4.2-2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fice.git;a=commitdiff_plain;h=b4620c5f60c51fe343f62cd07e60a9c653ce8fbf

- fix building with db 5.3
- release 2
---

diff --git a/ice-db.patch b/ice-db.patch
new file mode 100644
index 0000000..1e2c8d0
--- /dev/null
+++ b/ice-db.patch
@@ -0,0 +1,11 @@
+--- Ice-3.4.2/cpp/src/Freeze/MapI.cpp~	2012-09-06 12:24:18.042948870 +0200
++++ Ice-3.4.2/cpp/src/Freeze/MapI.cpp	2012-09-06 12:28:20.686273643 +0200
+@@ -1497,7 +1497,7 @@
+ 
+     try
+     {
+-#if DB_VERSION_MAJOR != 4
++#if DB_VERSION_MAJOR < 4
+ #error Freeze requires DB 4.x
+ #endif
+ #if DB_VERSION_MINOR < 3
diff --git a/ice.spec b/ice.spec
index 12ca8b0..fb3d7b9 100644
--- a/ice.spec
+++ b/ice.spec
@@ -17,7 +17,7 @@
 Summary:	The Ice base runtime and services
 Name:		ice
 Version:	3.4.2
-Release:	1
+Release:	2
 License:	GPL v2 with exceptions (see ICE_LICENSE)
 Group:		Applications
 URL:		http://www.zeroc.com/
@@ -37,6 +37,7 @@ Patch2:		java-build.patch
 Patch3:		jgoodies.patch
 Patch4:		ice-gcc46.patch
 Patch5:		ice-gcc47.patch
+Patch6:		ice-db.patch
 BuildRequires:	bzip2-devel
 BuildRequires:	db-cxx-devel
 BuildRequires:	expat-devel
@@ -172,6 +173,7 @@ The Ice runtime for PHP applications.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # no longer included in 3.4
 rm -f *man-pages/slice2docbook.1