Hello community, here is the log from the commit of package libdb-4_8 for openSUSE:Factory checked in at 2013-06-20 15:00:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdb-4_8 (Old) and /work/SRC/openSUSE:Factory/.libdb-4_8.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdb-4_8" Changes: -------- --- /work/SRC/openSUSE:Factory/libdb-4_8/libdb-4_8.changes 2012-11-20 10:37:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libdb-4_8.new/libdb-4_8.changes 2013-06-20 15:18:26.000000000 +0200 @@ -1,0 +2,17 @@ +Wed Jun 19 11:13:31 UTC 2013 - wer...@suse.de + +- Explicit add a conflict to other providers of /usr/lib/libdb.so + and /usr/lib/libdb-4.so + +------------------------------------------------------------------- +Tue Jun 18 11:48:48 UTC 2013 - wer...@suse.de + +- Try to change baselibs.conf to fit coolo's comment hopefully + +------------------------------------------------------------------- +Thu Jun 13 23:11:33 UTC 2013 - jeng...@inai.de + +- Rename db_ binaries to db48_ to make room for libdb-6_0 +- Add conflict markers against libdb-4_5 (overlapping files) + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/libdb-4_8/libdb_java-4_8.changes 2012-01-09 21:43:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libdb-4_8.new/libdb_java-4_8.changes 2013-06-20 15:18:26.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 13 23:11:33 UTC 2013 - jeng...@inai.de + +- Add conflict markers against libdb-4_5 (overlapping files) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdb-4_8.spec ++++++ --- /var/tmp/diff_new_pack.jWFSaH/_old 2013-06-20 15:18:27.000000000 +0200 +++ /var/tmp/diff_new_pack.jWFSaH/_new 2013-06-20 15:18:27.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libdb-4_8 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,8 @@ Summary: Berkeley DB Database Library Version 4.8 License: BSD-3-Clause Group: System/Libraries -Url: http://www.sleepycat.com +Url: http://oracle.com/technetwork/products/berkeleydb/ + Source: db-%{version}.tar.bz2 Source1: %{name}.changes Source9: getpatches @@ -48,18 +49,18 @@ This package contains the necessary runtime libraries. -%package -n db-utils +%package -n db48-utils Summary: Command Line tools for Managing Berkeley DB Databases Group: Productivity/Databases/Tools -%description -n db-utils +%description -n db48-utils The Berkeley DB Database is a programmatic toolkit that provides database support for applications. This package contains the command line tools for managing Berkeley DB databases. -%package -n db-doc +%package -n db48-doc Summary: Documentation for Berkeley DB Group: Development/Libraries/C and C++ Provides: db-utils-doc = %{version} @@ -67,7 +68,7 @@ BuildArch: noarch %endif -%description -n db-doc +%description -n db48-doc The Berkeley DB Database is a programmatic toolkit that provides database support for applications. @@ -78,7 +79,7 @@ Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: glibc-devel -Provides: db-devel = %{version} +Conflicts: libdb-4_5-devel %description devel The Berkeley DB Database is a programmatic toolkit that provides @@ -166,6 +167,12 @@ # Remove crappy *.la files rm -rf %{buildroot}%{_libdir}/*.la rm -rf %{buildroot}%{_libdir}/tls/*.la + +for i in archive checkpoint deadlock dump hotbackup load printlog \ + recover sql stat upgrade verify; do + mv "%buildroot/%_bindir/db_$i" "%buildroot/%_bindir/db48_$i" +done + %fdupes %{buildroot}%{_libdir} %fdupes %{buildroot}%{docdir} @@ -178,7 +185,7 @@ %{_libdir}/libdb-%{major}.%{minor}.so %{_libdir}/libdb_cxx-%{major}.%{minor}.so -%files -n db-doc +%files -n db48-doc %defattr(-,root,root) %dir %{docdir} %doc %{docdir}/LICENSE @@ -194,20 +201,20 @@ %doc %{docdir}/programmer_reference %doc %{docdir}/tutorial -%files -n db-utils +%files -n db48-utils %defattr(-,root,root) -%{_bindir}/db_archive -%{_bindir}/db_checkpoint -%{_bindir}/db_deadlock -%{_bindir}/db_dump -%{_bindir}/db_load -%{_bindir}/db_printlog -%{_bindir}/db_recover -%{_bindir}/db_sql -%{_bindir}/db_stat -%{_bindir}/db_upgrade -%{_bindir}/db_verify -%{_bindir}/db_hotbackup +%{_bindir}/db48_archive +%{_bindir}/db48_checkpoint +%{_bindir}/db48_deadlock +%{_bindir}/db48_dump +%{_bindir}/db48_hotbackup +%{_bindir}/db48_load +%{_bindir}/db48_printlog +%{_bindir}/db48_recover +%{_bindir}/db48_sql +%{_bindir}/db48_stat +%{_bindir}/db48_upgrade +%{_bindir}/db48_verify %files devel %defattr(-,root,root) ++++++ libdb_java-4_8.spec ++++++ --- /var/tmp/diff_new_pack.jWFSaH/_old 2013-06-20 15:18:27.000000000 +0200 +++ /var/tmp/diff_new_pack.jWFSaH/_new 2013-06-20 15:18:27.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libdb_java-4_8 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,8 @@ Summary: Java Bindings for the Berkeley DB License: BSD-3-Clause Group: Productivity/Databases/Servers -Url: http://www.sleepycat.com +Url: http://oracle.com/technetwork/products/berkeleydb/ + Source: db-%{version}.tar.bz2 Source1: %{name}.changes Source9: getpatches @@ -40,6 +41,7 @@ Requires: libdb-%{major}_%{minor} = %{version} Provides: db-java = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build +Conflicts: libdb_java-4_5 %description These are the Java bindings for the Berkeley DB. They are needed for @@ -51,6 +53,7 @@ Requires: %{name} = %{version} Requires: glibc-devel Provides: db-java-devel = %{version} +Conflicts: libdb_java-4_5-devel %description devel These are the Java bindings for the Berkeley DB. They are needed for ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.jWFSaH/_old 2013-06-20 15:18:27.000000000 +0200 +++ /var/tmp/diff_new_pack.jWFSaH/_new 2013-06-20 15:18:27.000000000 +0200 @@ -1,2 +1,10 @@ libdb-4_8 libdb-4_8-devel + requires -libdb-<targettype> + requires "libdb-4_8-<targettype> = <version>" + provides "libdb-4-<targettype> = <version>" + provides "libdb-<targettype> = <version>" + provides "libdb_cxx-4-<targettype> = <version>" + provides "libdb_cxx-<targettype> = <version>" + conflicts "libdb-4_5-devel-<targettype>" + conflicts "libdb-6_0-devel-<targettype>" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
