packages: db5.1/db5.1.spec - new URLs, updated to 5.1.29 - versioned db.jar...

qboosh qboosh at pld-linux.org
Sun Dec 11 20:38:58 CET 2011


Author: qboosh                       Date: Sun Dec 11 19:38:58 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- new URLs, updated to 5.1.29
- versioned db.jar and utils (+symlinks)

---- Files affected:
packages/db5.1:
   db5.1.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/db5.1/db5.1.spec
diff -u packages/db5.1/db5.1.spec:1.1 packages/db5.1/db5.1.spec:1.2
--- packages/db5.1/db5.1.spec:1.1	Wed May 11 16:44:08 2011
+++ packages/db5.1/db5.1.spec	Sun Dec 11 20:38:53 2011
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	java		# don't build java bindings
+%bcond_without	java		# don't build Java bindings
 %bcond_without	tcl		# don't build Tcl bindings
 %bcond_without	static_libs	# don't build static libraries
 
@@ -9,7 +9,7 @@
 
 %define		major		5
 %define		libver		%{major}.1
-%define		ver		%{libver}.25
+%define		ver		%{libver}.29
 %define		patchlevel	0
 Summary:	Berkeley DB database library for C
 Summary(pl.UTF-8):	Biblioteka C do obsługi baz Berkeley DB
@@ -18,10 +18,10 @@
 Release:	1
 License:	BSD-like (see LICENSE)
 Group:		Libraries
-#Source0Download: http://www.oracle.com/technetwork/database/berkeleydb/downloads/index.html
+#Source0Download: http://www.oracle.com/technetwork/database/berkeleydb/downloads/index-082944.html
 Source0:	http://download.oracle.com/berkeley-db/db-%{ver}.tar.gz
-# Source0-md5:	06656429bfc1abb6c0498eaeff70cd04
-URL:		http://www.oracle.com/technetwork/database/berkeleydb/overview/index.html
+# Source0-md5:	a94ea755ab695bc04f82b94d2e24a1ef
+URL:		http://www.oracle.com/technetwork/database/berkeleydb/downloads/index.html
 BuildRequires:	automake
 %if %{with java}
 BuildRequires:	jdk
@@ -32,8 +32,8 @@
 BuildRequires:	sed >= 4.0
 %{?with_tcl:BuildRequires:	tcl-devel >= 8.4.0}
 Requires:	uname(release) >= 2.6.0
-Provides:	db = %{libver}
 Provides:	db = %{version}-%{release}
+Provides:	db = %{libver}
 Obsoletes:	db4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -163,7 +163,6 @@
 Group:		Libraries
 Requires:	jpackage-utils
 Provides:	db-java = %{version}-%{release}
-# db.jar conflicts
 Obsoletes:	db-java
 
 %description java
@@ -327,9 +326,6 @@
 %prep
 %setup -q -n db-%{ver}
 
-# official patches
-#%%patchset_patch 1 %{patchlevel}
-
 %build
 cp -f /usr/share/automake/config.sub dist
 
@@ -346,7 +342,6 @@
 CFLAGS="%{rpmcflags}"
 CXXFLAGS="%{rpmcflags} -fno-implicit-templates"
 LDFLAGS="%{rpmcflags} %{rpmldflags}"
-
 export CC CXX CFLAGS CXXFLAGS LDFLAGS
 
 ../dist/%configure \
@@ -398,40 +393,45 @@
 
 %if %{with static_libs}
 %{__make} -C build_unix.static library_install \
-	docdir=%{_docdir}/db-%{version}-docs \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	docdir=%{_docdir}/db-%{version}-docs
 %endif
 
 %{__make} -C build_unix library_install \
-	docdir=%{_docdir}/db-%{version}-docs \
 	DESTDIR=$RPM_BUILD_ROOT \
-	LIB_INSTALL_FILE_LIST=""
+	LIB_INSTALL_FILE_LIST="" \
+	docdir=%{_docdir}/db-%{version}-docs
 
 mv $RPM_BUILD_ROOT%{_libdir}/libdb-%{libver}.so $RPM_BUILD_ROOT/%{_lib}
 
 cd $RPM_BUILD_ROOT%{_libdir}
+%if %{with static_libs}
+mv -f libdb.a libdb-%{libver}.a
+mv -f libdb_cxx.a libdb_cxx-%{libver}.a
+%endif
+%if %{with java}
+mv -f $RPM_BUILD_ROOT%{_libdir}/db.jar $RPM_BUILD_ROOT%{_javadir}/db-%{libver}.jar
+%endif
 ln -sf /%{_lib}/libdb-%{libver}.so libdb.so
 ln -sf /%{_lib}/libdb-%{libver}.so libdb-%{libver}.so
 ln -sf /%{_lib}/libdb-%{libver}.so libndbm.so
 ln -sf libdb-%{libver}.la libdb.la
 ln -sf libdb-%{libver}.la libndbm.la
+ln -sf libdb_cxx-%{libver}.so libdb_cxx.so
+ln -sf libdb_cxx-%{libver}.la libdb_cxx.la
 %if %{with java}
 ln -sf libdb_java-%{libver}.la libdb_java.la
-mv -f $RPM_BUILD_ROOT%{_libdir}/*.jar $RPM_BUILD_ROOT%{_javadir}
+ln -sf db-%{libver}.jar $RPM_BUILD_ROOT%{_javadir}/db.jar
 %endif
 %if %{with tcl}
 ln -sf libdb_tcl-%{libver}.so libdb_tcl.so
 ln -sf libdb_tcl-%{libver}.la libdb_tcl.la
 %endif
-ln -sf libdb_cxx-%{libver}.la libdb_cxx.la
 %if %{with static_libs}
-mv -f libdb.a libdb-%{libver}.a
 ln -sf libdb-%{libver}.a libdb.a
 ln -sf libdb-%{libver}.a libndbm.a
-mv -f libdb_cxx.a libdb_cxx-%{libver}.a
 ln -sf libdb_cxx-%{libver}.a libdb_cxx.a
 %endif
-ln -sf libdb_cxx-%{libver}.so libdb_cxx.so
 
 sed -i "s/old_library=''/old_library='libdb-%{libver}.a'/" libdb-%{libver}.la
 sed -i "s/old_library=''/old_library='libdb_cxx-%{libver}.a'/" libdb_cxx-%{libver}.la
@@ -439,9 +439,10 @@
 cd -
 
 cd $RPM_BUILD_ROOT%{_bindir}
-mv dbsql{,-%{libver}}
+mv dbsql dbsql-%{libver}
 for F in db_*; do
-  mv $F $(echo $F|sed 's/db_/db%{libver}_/')
+  Fver=$(echo $F|sed 's/db_/db%{libver}_/')
+  mv $F $Fver
 done
 cd -
 
@@ -488,11 +489,11 @@
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/db%{libver}_sql_codegen
+%{_libdir}/libdb-%{libver}.la
 %attr(755,root,root) %{_libdir}/libdb-%{libver}.so
 %attr(755,root,root) %{_libdir}/libdb-%{major}.so
 %attr(755,root,root) %{_libdir}/libdb.so
 %attr(755,root,root) %{_libdir}/libndbm.so
-%{_libdir}/libdb-%{libver}.la
 %{_libdir}/libdb.la
 %{_libdir}/libndbm.la
 %{_includedir}/db.h
@@ -527,9 +528,9 @@
 
 %files cxx-devel
 %defattr(644,root,root,755)
+%{_libdir}/libdb_cxx-%{libver}.la
 %attr(755,root,root) %{_libdir}/libdb_cxx.so
 %attr(755,root,root) %{_libdir}/libdb_cxx-%{major}.so
-%{_libdir}/libdb_cxx-%{libver}.la
 %{_libdir}/libdb_cxx.la
 %{_includedir}/db_cxx.h
 %{_docdir}/db-%{version}-docs/api_reference/CXX
@@ -551,13 +552,14 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libdb_java-%{libver}.so
 %attr(755,root,root) %{_libdir}/libdb_java-%{libver}_g.so
+%{_javadir}/db-%{libver}.jar
 %{_javadir}/db.jar
 
 %files java-devel
 %defattr(644,root,root,755)
+%{_libdir}/libdb_java-%{libver}.la
 %attr(755,root,root) %{_libdir}/libdb_java.so
 %attr(755,root,root) %{_libdir}/libdb_java-%{major}.so
-%{_libdir}/libdb_java-%{libver}.la
 %{_libdir}/libdb_java.la
 %{_docdir}/db-%{version}-docs/collections
 %{_docdir}/db-%{version}-docs/gsg/JAVA
@@ -574,9 +576,9 @@
 
 %files tcl-devel
 %defattr(644,root,root,755)
+%{_libdir}/libdb_tcl-%{libver}.la
 %attr(755,root,root) %{_libdir}/libdb_tcl.so
 %attr(755,root,root) %{_libdir}/libdb_tcl-%{major}.so
-%{_libdir}/libdb_tcl-%{libver}.la
 %{_libdir}/libdb_tcl.la
 %{_docdir}/db-%{version}-docs/api_reference/TCL
 %endif
@@ -587,9 +589,9 @@
 
 %files sql-devel
 %defattr(644,root,root,755)
+%{_libdir}/libdb_sql-%{libver}.la
 %attr(755,root,root) %{_libdir}/libdb_sql.so
 %attr(755,root,root) %{_libdir}/libdb_sql-%{major}.so
-%{_libdir}/libdb_sql-%{libver}.la
 %{_includedir}/dbsql.h
 %{_docdir}/db-%{version}-docs/bdb-sql
 
@@ -599,9 +601,9 @@
 
 %files stl-devel
 %defattr(644,root,root,755)
+%{_libdir}/libdb_stl-%{libver}.la
 %attr(755,root,root) %{_libdir}/libdb_stl.so
 %attr(755,root,root) %{_libdir}/libdb_stl-%{major}.so
-%{_libdir}/libdb_stl-%{libver}.la
 %{_includedir}/dbstl_base_iterator.h
 %{_includedir}/dbstl_common.h
 %{_includedir}/dbstl_container.h
@@ -649,5 +651,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2011/12/11 19:38:53  qboosh
+- new URLs, updated to 5.1.29
+- versioned db.jar and utils (+symlinks)
+
 Revision 1.1  2011/05/11 14:44:08  qboosh
 - new
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/db5.1/db5.1.spec?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list