- unified; install versioned db.jar and db-utils (with symlinks if built as default_db)

Changed files:
    db4.3.spec -> 1.25

diff --git a/db4.3.spec b/db4.3.spec
index e884346e844e9c0c7a20b999249489cbc4cac46c..42f6f0c8db84239e5ac63a793f643687777f1266 100644 (file)
--- a/db4.3.spec
+++ b/db4.3.spec
@@ -238,6 +238,8 @@ Group:              Applications/Databases
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 %if %{with default_db}
 Provides:      db-utils = %{version}-%{release}
+Obsoletes:     db-utils
+Obsoletes:     db3-utils
 Obsoletes:     db4-utils
 %endif
 
@@ -295,7 +297,7 @@ CC="%{__cc}"
 CXX="%{__cxx}"
 CFLAGS="%{rpmcflags}"
 CXXFLAGS="%{rpmcflags} -fno-implicit-templates"
-LDFLAGS="%{rpmldflags}"
+LDFLAGS="%{rpmcflags} %{rpmldflags}"
 export CC CXX CFLAGS CXXFLAGS LDFLAGS
 
 ../dist/%configure \
@@ -364,7 +366,7 @@ mv -f libdb.a libdb-4.3.a
 mv -f libdb_cxx.a libdb_cxx-4.3.a
 %endif
 %if %{with java}
-mv -f $RPM_BUILD_ROOT%{_libdir}/*.jar $RPM_BUILD_ROOT%{_javadir}
+mv -f $RPM_BUILD_ROOT%{_libdir}/db.jar $RPM_BUILD_ROOT%{_javadir}/db-4.3.jar
 %endif
 %if %{with default_db}
 ln -sf /%{_lib}/libdb-4.3.so libdb.so
@@ -378,6 +380,7 @@ ln -sf libdb_cxx-4.3.so libdb_cxx.so
 ln -sf libdb_cxx-4.3.la libdb_cxx.la
 %if %{with java}
 ln -sf libdb_java-4.3.la libdb_java.la
+ln -sf db-4.3.jar $RPM_BUILD_ROOT%{_javadir}/db.jar
 %endif
 %if %{with tcl}
 ln -sf libdb_tcl-4.3.so libdb_tcl.so
@@ -394,6 +397,16 @@ ln -sf libdb_cxx-4.3.a libdb_cxx.a
 sed -i "s/old_library=''/old_library='libdb-4.3.a'/" libdb-4.3.la
 sed -i "s/old_library=''/old_library='libdb_cxx-4.3.a'/" libdb_cxx-4.3.la
 
+cd -
+
+cd $RPM_BUILD_ROOT%{_bindir}
+mv -f berkeley_db_svc berkeley_db_svc-4.3
+%{?with_default_db:ln -sf berkeley_db_svc-4.3 berkeley_db_svc}
+for F in db_*; do
+  Fver=$(echo $F|sed 's/db_/db4.3_/')
+  mv $F $Fver
+  %{?with_default_db:ln -sf $Fver $F}
+done
 cd -
 rm -f examples_c*/tags
 install -d $RPM_BUILD_ROOT%{_examplesdir}/db-%{version}
@@ -496,7 +509,10 @@ rm -rf $RPM_BUILD_ROOT
 %files java
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libdb_java-4.3.so
+%{_javadir}/db-4.3.jar
+%if %{with default_db}
 %{_javadir}/db.jar
+%endif
 
 %files java-devel
 %defattr(644,root,root,755)
@@ -528,16 +544,30 @@ rm -rf $RPM_BUILD_ROOT
 
 %files utils
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/berkeley_db_svc-4.3
+%attr(755,root,root) %{_bindir}/db4.3_archive
+%attr(755,root,root) %{_bindir}/db4.3_checkpoint
+%attr(755,root,root) %{_bindir}/db4.3_deadlock
+%attr(755,root,root) %{_bindir}/db4.3_dump
+#%attr(755,root,root) %{_bindir}/db4.3_dump185
+%attr(755,root,root) %{_bindir}/db4.3_load
+%attr(755,root,root) %{_bindir}/db4.3_printlog
+%attr(755,root,root) %{_bindir}/db4.3_recover
+%attr(755,root,root) %{_bindir}/db4.3_stat
+%attr(755,root,root) %{_bindir}/db4.3_upgrade
+%attr(755,root,root) %{_bindir}/db4.3_verify
+%if %{with default_db}
 %attr(755,root,root) %{_bindir}/berkeley_db_svc
-%attr(755,root,root) %{_bindir}/db*_archive
-%attr(755,root,root) %{_bindir}/db*_checkpoint
-%attr(755,root,root) %{_bindir}/db*_deadlock
-%attr(755,root,root) %{_bindir}/db*_dump
-#%attr(755,root,root) %{_bindir}/db*_dump185
-%attr(755,root,root) %{_bindir}/db*_load
-%attr(755,root,root) %{_bindir}/db*_printlog
-%attr(755,root,root) %{_bindir}/db*_recover
-%attr(755,root,root) %{_bindir}/db*_stat
-%attr(755,root,root) %{_bindir}/db*_upgrade
-%attr(755,root,root) %{_bindir}/db*_verify
+%attr(755,root,root) %{_bindir}/db_archive
+%attr(755,root,root) %{_bindir}/db_checkpoint
+%attr(755,root,root) %{_bindir}/db_deadlock
+%attr(755,root,root) %{_bindir}/db_dump
+#%attr(755,root,root) %{_bindir}/db_dump185
+%attr(755,root,root) %{_bindir}/db_load
+%attr(755,root,root) %{_bindir}/db_printlog
+%attr(755,root,root) %{_bindir}/db_recover
+%attr(755,root,root) %{_bindir}/db_stat
+%attr(755,root,root) %{_bindir}/db_upgrade
+%attr(755,root,root) %{_bindir}/db_verify
+%endif
 %{_docdir}/db-%{version}-docs/utility