[libdb4] Removed dependency on gcc-java
Jan Staněk
jstanek at fedoraproject.org
Tue Apr 2 06:54:05 UTC 2013
commit 184a4c5e4bebde6d65ac66d831387ea51d45b670
Author: Jan Staněk <jstanek at redhat.com>
Date: Tue Apr 2 08:53:19 2013 +0200
Removed dependency on gcc-java
db-4.5.20-jni-include-dir.patch | 2 +-
libdb4.spec | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/db-4.5.20-jni-include-dir.patch b/db-4.5.20-jni-include-dir.patch
index fe82d38..b0881c3 100644
--- a/db-4.5.20-jni-include-dir.patch
+++ b/db-4.5.20-jni-include-dir.patch
@@ -6,7 +6,7 @@ diff -up db-4.7.25/dist/configure.ac.jni db-4.7.25/dist/configure.ac
AC_PROG_JAR
AC_PROG_JAVA
- AC_JNI_INCLUDE_DIR
-+ JNI_INCLUDE_DIRS="/usr/lib/jvm/java-1.5.0-gcj/include"
++ JNI_INCLUDE_DIRS="/usr/lib/jvm/java/include /usr/lib/jvm/java/include/linux"
AC_MSG_CHECKING(java version)
case "$JAVA" in
diff --git a/libdb4.spec b/libdb4.spec
index bb6b352..ac4acd9 100644
--- a/libdb4.spec
+++ b/libdb4.spec
@@ -27,7 +27,6 @@ Provides: db4 = %{version}
BuildRequires: perl perl-Carp libtool ed util-linux-ng
BuildRequires: tcl-devel%{?_isa} >= 8.5.2-3
BuildRequires: chrpath
-BuildRequires: gcc-java
BuildRequires: java-devel >= 1:1.6.0
%description
@@ -382,6 +381,9 @@ chrpath -d ${RPM_BUILD_ROOT}%{_libdir}/*.so ${RPM_BUILD_ROOT}%{_bindir}/*
%{_libdir}/%{name}/libdb_java.so
%changelog
+* Tue Apr 02 2013 Jan Stanek <jstanek at redhat.com> - 4.8.30-8
+- Removed dependency on gcc-java
+
* Tue Mar 26 2013 Jan Stanek <jstanek at redhat.com> - 4.8.30-7
- Fix file conflict with libdb-java (#800359)
- Add missing perl-Carp to BuildRequires
More information about the scm-commits
mailing list