Removed dependency on obsolete gcc-java package (#927742)
This commit is contained in:
parent
2548a6fd46
commit
85eeffff6e
13
libdb.spec
13
libdb.spec
@ -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: 6%{?dist}
|
Release: 7%{?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
|
||||||
@ -22,7 +22,6 @@ License: BSD and LGPLv2
|
|||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
BuildRequires: perl libtool
|
BuildRequires: perl libtool
|
||||||
BuildRequires: tcl-devel >= 8.5.2-3
|
BuildRequires: tcl-devel >= 8.5.2-3
|
||||||
BuildRequires: gcc-java
|
|
||||||
BuildRequires: java-devel >= 1:1.6.0
|
BuildRequires: java-devel >= 1:1.6.0
|
||||||
BuildRequires: chrpath
|
BuildRequires: chrpath
|
||||||
Conflicts: filesystem < 3
|
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=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 -C \
|
%configure CPPFLAGS="$java_include" -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} \
|
||||||
@ -396,6 +400,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-7
|
||||||
|
- Removed dependency on obsolete gcc-java package (#927742)
|
||||||
|
|
||||||
* Thu Mar 7 2013 Jindrich Novy <jnovy@redhat.com> 5.3.21-6
|
* Thu Mar 7 2013 Jindrich Novy <jnovy@redhat.com> 5.3.21-6
|
||||||
- add LGPLv2+ and remove Sleepycat in license tag (#886838)
|
- add LGPLv2+ and remove Sleepycat in license tag (#886838)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user