diff --git a/db4.spec b/db4.spec index 957119f..fea2ad9 100644 --- a/db4.spec +++ b/db4.spec @@ -5,7 +5,7 @@ Summary: The Berkeley DB database library (version 4) for C Name: db4 Version: 4.8.30 -Release: 4%{?dist} +Release: 4.0.usrmove.1%{?dist} Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz # db-1.85 upstream patches @@ -22,6 +22,7 @@ License: BSD Group: System Environment/Libraries # unversioned obsoletes are OK here as these BDB versions never occur again Obsoletes: db1, db2, db3 +#Conflicts: filesystem < 3 BuildRequires: perl, libtool, ed, util-linux-ng BuildRequires: tcl-devel >= 8.5.2-3 %ifarch %{java_arches} @@ -243,24 +244,6 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libdb_tcl.so chmod +x ${RPM_BUILD_ROOT}%{_libdir}/*.so* -# Move the main shared library from /usr/lib* to /lib* directory. -if [ "%{_libdir}" != "/%{_lib}" ]; then - mkdir -p $RPM_BUILD_ROOT/%{_lib}/ - mv $RPM_BUILD_ROOT/%{_libdir}/libdb-%{__soversion}.so $RPM_BUILD_ROOT/%{_lib}/ - -# Leave relative symlinks in %{_libdir}. - touch $RPM_BUILD_ROOT/rootfile - root=.. - while [ ! -e $RPM_BUILD_ROOT/%{_libdir}/${root}/rootfile ] ; do - root=${root}/.. - done - rm $RPM_BUILD_ROOT/rootfile - - ln -sf ${root}/%{_lib}/libdb-%{__soversion}.so $RPM_BUILD_ROOT/%{_libdir}/libdb.so - ln -sf ${root}/%{_lib}/libdb-%{__soversion}.so $RPM_BUILD_ROOT/%{_libdir}/ - ln -sf libdb_cxx-%{__soversion}.so $RPM_BUILD_ROOT/%{_libdir}/libdb_cxx.so -fi - # Move the header files to a subdirectory, in case we're deploying on a # system with multiple versions of DB installed. mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/db4 @@ -311,7 +294,6 @@ rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root) %doc LICENSE README -/%{_lib}/libdb-%{__soversion}.so %{_libdir}/libdb-%{__soversion}.so %files cxx