packages: db4.3/db4.3.spec - unified; install versioned db.jar and db-utils...

[qboosh]

Author: qboosh                       Date: Tue Dec 13 15:20:10 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unified; install versioned db.jar and db-utils (with symlinks if built as default_db)

---- Files affected:
packages/db4.3:
   db4.3.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: packages/db4.3/db4.3.spec
diff -u packages/db4.3/db4.3.spec:1.24 packages/db4.3/db4.3.spec:1.25
--- packages/db4.3/db4.3.spec:1.24	Sun Dec 11 10:34:22 2011
+++ packages/db4.3/db4.3.spec	Tue Dec 13 16:20:05 2011
@@ -239,6 +239,8 @@
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 %if %{with default_db}
 Provides:	db-utils = %{version}-%{release}
+Obsoletes:	db-utils
+Obsoletes:	db3-utils
 Obsoletes:	db4-utils
 %endif
 
@@ -296,7 +298,7 @@
 CXX="%{__cxx}"
 CFLAGS="%{rpmcflags}"
 CXXFLAGS="%{rpmcflags} -fno-implicit-templates"
-LDFLAGS="%{rpmldflags}"
+LDFLAGS="%{rpmcflags} %{rpmldflags}"
 export CC CXX CFLAGS CXXFLAGS LDFLAGS
 
 ../dist/%configure \
@@ -365,7 +367,7 @@
 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
@@ -379,6 +381,7 @@
 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
@@ -396,6 +399,16 @@
 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}
 cp -rf examples_c/* $RPM_BUILD_ROOT%{_examplesdir}/db-%{version}
@@ -497,7 +510,10 @@
 %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)
@@ -529,18 +545,32 @@
 
 %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
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -549,6 +579,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2011/12/13 15:20:05  qboosh
+- unified; install versioned db.jar and db-utils (with symlinks if built as default_db)
+
 Revision 1.24  2011/12/11 09:34:22  qboosh
 - fixed includedir
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/db4.3/db4.3.spec?r1=1.24&r2=1.25&f=u