rpms/libdb
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Cleaning the specfile - removed gcc-java dependecy other way

Browse Source
This commit is contained in:
Jan Staněk 2013-03-27 17:50:05 +01:00
parent 85eeffff6e
commit c0ee04424d
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db-4.5.20-jni-include-dir.patch
View File

@ -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_JAR
AC_PROG_JAVA AC_PROG_JAVA
- AC_JNI_INCLUDE_DIR - 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) AC_MSG_CHECKING(java version)
case "$JAVA" in case "$JAVA" in

12
libdb.spec
View File

@ -4,7 +4,7 @@
Summary: The Berkeley DB database library for C Summary: The Berkeley DB database library for C
Name: libdb Name: libdb
Version: 5.3.21 Version: 5.3.21
Release: 7%{?dist} Release: 8%{?dist}
Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz
Patch0: libdb-multiarch.patch Patch0: libdb-multiarch.patch
@ -215,14 +215,9 @@ 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=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 /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 pushd dist/dist-tls
ln -sf ../configure . ln -sf ../configure .
%configure CPPFLAGS="$java_include" -C \ %configure -C \
--enable-compat185 --enable-dump185 \ --enable-compat185 --enable-dump185 \
--enable-shared --enable-static \ --enable-shared --enable-static \
--enable-tcl --with-tcl=%{_libdir} \ --enable-tcl --with-tcl=%{_libdir} \
@ -400,6 +395,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_libdir}/libdb_java.so %{_libdir}/libdb_java.so
%changelog %changelog
* Wed Mar 27 2013 Jan Stanek <jstanek@redhat.com> 5.3.21-8
- Cleaning the specfile - removed gcc-java dependecy other way
* Wed Mar 27 2013 Jan Stanek <jstanek@redhat.com> 5.3.21-7 * Wed Mar 27 2013 Jan Stanek <jstanek@redhat.com> 5.3.21-7
- Removed dependency on obsolete gcc-java package (#927742) - Removed dependency on obsolete gcc-java package (#927742)