diff --git a/libdb.spec b/libdb.spec index d60b3ab..9f332df 100644 --- a/libdb.spec +++ b/libdb.spec @@ -4,7 +4,7 @@ Summary: The Berkeley DB database library for C Name: libdb Version: 5.2.36 -Release: 1%{?dist} +Release: 1.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 @@ -26,6 +26,7 @@ BuildRequires: java-1.6.0-openjdk-devel BuildRequires: chrpath BuildRequires: dos2unix BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +#Conflicts: filesystem < 3 %description The Berkeley Database (Berkeley DB) is a programmatic toolkit that @@ -228,24 +229,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}/%{name} @@ -307,7 +290,6 @@ rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root,-) %doc LICENSE README -/%{_lib}/libdb-%{__soversion}.so %{_libdir}/libdb-%{__soversion}.so %files utils