Removed java dependency

Signed-off-by: Eduardo Lima (Etrunko) <eduardo.lima@intel.com>

diff --git a/packaging/db-4.5.20-jni-include-dir.patch b/packaging/db-4.5.20-jni-include-dir.patch
deleted file mode 100644 (file)
index b0881c3..0000000
--- a/packaging/db-4.5.20-jni-include-dir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up db-4.7.25/dist/configure.ac.jni db-4.7.25/dist/configure.ac
---- db-4.7.25/dist/configure.ac.jni    2008-08-20 14:22:59.000000000 +0200
-+++ db-4.7.25/dist/configure.ac        2008-08-20 14:23:39.000000000 +0200
-@@ -418,7 +418,7 @@ if test "$db_cv_java" = "yes"; then
-       AC_PROG_JAVAC
-       AC_PROG_JAR
-       AC_PROG_JAVA
--      AC_JNI_INCLUDE_DIR
-+      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/packaging/libdb.spec b/packaging/libdb.spec
index d2ae71d..1196f13 100644 (file)
--- a/packaging/libdb.spec
+++ b/packaging/libdb.spec
@@ -6,14 +6,11 @@ Name: libdb
 Version: 5.3.21
 Release: 11
 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
-# other patches
-Patch24: db-4.5.20-jni-include-dir.patch
 URL: http://www.oracle.com/database/berkeley-db/
 License: BSD-3-Clause and LGPL-2.0+
 Group: System/Libraries
 BuildRequires: perl libtool
 BuildRequires: tcl-devel >= 8.5.2-3
-BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: chrpath
 Conflicts: filesystem < 3
 
@@ -153,33 +150,9 @@ provides embedded database support for both traditional and
 client/server applications. This package contains the libraries
 for building programs which use the Berkeley DB in SQL.
 
-%package java
-Summary: Development files for using the Berkeley DB with Java
-Group: Development/Libraries
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description java
-The Berkeley Database (Berkeley DB) is a programmatic toolkit that
-provides embedded database support for both traditional and
-client/server applications. This package contains the libraries
-for building programs which use the Berkeley DB in Java.
-
-%package java-devel
-Summary: Development files for using the Berkeley DB with Java
-Group: Development/Libraries
-Requires: %{name}-java%{?_isa} = %{version}-%{release}
-
-%description java-devel
-The Berkeley Database (Berkeley DB) is a programmatic toolkit that
-provides embedded database support for both traditional and
-client/server applications. This package contains the libraries
-for building programs which use the Berkeley DB in Java.
-
 %prep
 %setup -q -n db-%{version}
 
-%patch24 -p1 -b .4.5.20.jni
-
 cd dist
 ./s_config
 
@@ -203,7 +176,7 @@ ln -sf ../configure .
        --enable-shared --enable-static \
        --enable-tcl --with-tcl=%{_libdir} \
        --enable-cxx --enable-sql \
-       --enable-java \
+    --disable-java \
        --enable-test \
        --disable-rpath \
        --with-tcl=%{_libdir}/tcl8.5
@@ -217,12 +190,6 @@ perl -pi -e 's/^postdep_objects=".*$/postdep_objects=""/' libtool
 perl -pi -e 's/-shared -nostdlib/-shared/' libtool
 
 make %{?_smp_mflags}
-
-# XXX hack around libtool not creating ./libs/libdb_java-X.Y.lai
-LDBJ=./.libs/libdb_java-%{__soversion}.la
-if test -f ${LDBJ} -a ! -f ${LDBJ}i; then
-       sed -e 's,^installed=no,installed=yes,' < ${LDBJ} > ${LDBJ}i
-fi
 popd
 
 %install
@@ -248,10 +215,6 @@ for i in db.h db_cxx.h db_185.h; do
        ln -s %{name}/$i ${RPM_BUILD_ROOT}%{_includedir}
 done
 
-# Move java jar file to the correct place
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/java
-mv ${RPM_BUILD_ROOT}%{_libdir}/*.jar ${RPM_BUILD_ROOT}%{_datadir}/java
-
 # Eliminate installed doco
 rm -rf ${RPM_BUILD_ROOT}%{_prefix}/docs
 
@@ -289,10 +252,6 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %postun -p /sbin/ldconfig tcl
 
-%post -p /sbin/ldconfig java
-
-%postun -p /sbin/ldconfig java
-
 %files
 %defattr(-,root,root,-)
 %doc LICENSE README
@@ -318,7 +277,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libdb_cxx-%{__soversion}.a
 %{_libdir}/libdb_tcl-%{__soversion}.a
 %{_libdir}/libdb_sql-%{__soversion}.a
-%{_libdir}/libdb_java-%{__soversion}.a
 
 %files utils
 %defattr(-,root,root,-)
@@ -366,12 +324,3 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/dbsql
 %{_libdir}/libdb_sql.so
 %{_includedir}/%{name}/dbsql.h
-
-%files java
-%defattr(-,root,root,-)
-%{_libdir}/libdb_java-%{__soversion_major}*.so
-%{_datadir}/java/*.jar
-
-%files java-devel
-%defattr(-,root,root,-)
-%{_libdir}/libdb_java.so