[libdb/f19] Removed dependency on obsolete gcc-java package (#927742)
Jan Staněk
jstanek at fedoraproject.org
Wed Mar 27 15:35:05 UTC 2013
commit 85eeffff6e12e9ba9766b0c2345740380e4f9058
Author: Jan Staněk <jstanek at redhat.com>
Date: Wed Mar 27 16:33:39 2013 +0100
Removed dependency on obsolete gcc-java package (#927742)
libdb.spec | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/libdb.spec b/libdb.spec
index b5f805d..a058a41 100644
--- a/libdb.spec
+++ b/libdb.spec
@@ -4,7 +4,7 @@
Summary: The Berkeley DB database library for C
Name: libdb
Version: 5.3.21
-Release: 6%{?dist}
+Release: 7%{?dist}
Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz
Patch0: libdb-multiarch.patch
@@ -22,7 +22,6 @@ License: BSD and LGPLv2
Group: System Environment/Libraries
BuildRequires: perl libtool
BuildRequires: tcl-devel >= 8.5.2-3
-BuildRequires: gcc-java
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: chrpath
Conflicts: filesystem < 3
@@ -216,9 +215,14 @@ test -d dist/dist-tls || mkdir dist/dist-tls
/bin/sh libtool --tag=CC --mode=compile %{__cc} $RPM_OPT_FLAGS -Idb.1.85/PORT/%{_os}/include -D_REENTRANT -c util/db_dump185.c -o dist/dist-tls/db_dump185.lo
/bin/sh libtool --tag=LD --mode=link %{__cc} -o dist/dist-tls/db_dump185 dist/dist-tls/db_dump185.lo db.1.85/PORT/%{_os}/libdb.a
+# Add java include paths
+for inc in -I/usr/lib/jvm/java/include{,/linux}; do
+ java_include="$java_include $inc"
+done
+
pushd dist/dist-tls
ln -sf ../configure .
-%configure -C \
+%configure CPPFLAGS="$java_include" -C \
--enable-compat185 --enable-dump185 \
--enable-shared --enable-static \
--enable-tcl --with-tcl=%{_libdir} \
@@ -396,6 +400,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_libdir}/libdb_java.so
%changelog
+* Wed Mar 27 2013 Jan Stanek <jstanek at redhat.com> 5.3.21-7
+- Removed dependency on obsolete gcc-java package (#927742)
+
* Thu Mar 7 2013 Jindrich Novy <jnovy at redhat.com> 5.3.21-6
- add LGPLv2+ and remove Sleepycat in license tag (#886838)
More information about the scm-commits
mailing list