[ice] fix broken deps in ice-java due to db4 -> libdb4 rename
Haïkel Guémar
hguemar at fedoraproject.org
Sat Sep 8 10:00:29 UTC 2012
commit e0a5c454c57e4d9f304fd78e2bc78f2c6d71eb45
Author: Haïkel Guémar <hguemar at fedoraproject.org>
Date: Sat Sep 8 09:53:51 2012 +0200
fix broken deps in ice-java due to db4 -> libdb4 rename
ice-3.4.2-libdb4.patch | 17 +++++++++++++++++
ice.spec | 14 ++++++++++----
2 files changed, 27 insertions(+), 4 deletions(-)
---
diff --git a/ice-3.4.2-libdb4.patch b/ice-3.4.2-libdb4.patch
new file mode 100644
index 0000000..b925a41
--- /dev/null
+++ b/ice-3.4.2-libdb4.patch
@@ -0,0 +1,17 @@
+diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
+index c412e5d..3feb00a 100644
+--- a/cpp/config/Make.rules
++++ b/cpp/config/Make.rules
+@@ -192,9 +192,9 @@ ifneq ($(DB_HOME),)
+ DB_LIBS = -L$(DB_HOME)/$(libsubdir) -ldb_cxx
+ DB_RPATH_LINK = $(call rpathlink,$(DB_HOME)/$(libsubdir))
+ else
+- ifeq ($(shell if [ -d /usr/include/db48 -a -d /usr/$(libsubdir)/db48 ] ; then echo yes; fi), yes)
+- DB_FLAGS = -I/usr/include/db48
+- DB_LIBS = -L/usr/$(libsubdir)/db48 -ldb_cxx
++ ifeq ($(shell if [ -d /usr/include/libdb4 -a -d /usr/$(libsubdir)/libdb4 ] ; then echo yes; fi), yes)
++ DB_FLAGS = -I/usr/include/libdb4
++ DB_LIBS = -L/usr/$(libsubdir)/libdb4 -ldb_cxx
+ else
+ DB_LIBS = -ldb_cxx
+ endif
diff --git a/ice.spec b/ice.spec
index b39f03c..617e136 100644
--- a/ice.spec
+++ b/ice.spec
@@ -7,7 +7,7 @@
Name: ice
Version: 3.4.2
-Release: 16%{?dist}
+Release: 17%{?dist}
Summary: ZeroC Object-Oriented middleware
Group: System Environment/Libraries
@@ -50,6 +50,8 @@ Patch7: ice-3.4.2-slice2cpp.patch
Patch8: ice-3.4.2-gcc47.patch
# ARM
Patch9: ice-3.4.2-arm.patch
+# libdb4
+Patch10: ice-3.4.2-libdb4.patch
# Ice doesn't officially support ppc64 at all
ExcludeArch: ppc64
@@ -62,8 +64,8 @@ ExcludeArch: ppc64
# Some file suffixes we need to grab the right stuff for the file lists
%define soversion 34
-BuildRequires: db4-devel, expat-devel, openssl-devel, bzip2-devel
-BuildRequires: ant, ant-nodeps, jpackage-utils, db4-java
+BuildRequires: libdb4-cxx-devel, expat-devel, openssl-devel, bzip2-devel
+BuildRequires: ant, ant-nodeps, jpackage-utils, libdb4-java
BuildRequires: php, php-devel
BuildRequires: ruby, ruby(abi) = 1.9.1, ruby-devel
BuildRequires: python-devel
@@ -118,7 +120,7 @@ Summary: Java runtime for Ice applications
Group: System Environment/Libraries
Requires: java >= 1:1.6.0
Requires: ice%{?_isa} = %{version}-%{release}
-Requires: db4-java%{?_isa}
+Requires: libdb4-java%{?_isa}
%description java
The Ice runtime for Java
@@ -221,6 +223,7 @@ Tools for developing Ice applications in PHP.
%patch7 -p1 -b .slice2cpp
%patch8 -p1 -b .gcc47
%patch9 -p1 -b .arm
+%patch10 -p1 -b .libdb4
tar xf %{SOURCE1}
rm -f ice-3.4.2-man-pages/slice2docbook.1
@@ -600,6 +603,9 @@ fi
%changelog
+* Sat Aug 04 2012 Haïkel Guémar <hguemar at fedoraproject.org> - 3.4.2-17
+- fix package requirements to follow the db4 -> libdb4 rename
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.2-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list