Accepting request 179654 from devel:libraries:c_c++

- Explicit add a conflict to other providers of /usr/lib/libdb.so
  and /usr/lib/libdb-4.so

- Try to change baselibs.conf to fit coolo's comment hopefully 

- Rename db_ binaries to db48_ to make room for libdb-6_0
- Add conflict markers against libdb-4_5 (overlapping files)

- Add conflict markers against libdb-4_5 (overlapping files)

OBS-URL: https://build.opensuse.org/request/show/179654
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libdb-4_8?expand=0&rev=17
This commit is contained in:
Stephan Kulow 2013-06-20 13:00:45 +00:00 committed by Git OBS Bridge
commit 5db6e4a5b4
5 changed files with 63 additions and 23 deletions

View File

@ -1,2 +1,10 @@
libdb-4_8 libdb-4_8
libdb-4_8-devel 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>"

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Jun 19 11:13:31 UTC 2013 - werner@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 - werner@suse.de
- Try to change baselibs.conf to fit coolo's comment hopefully
-------------------------------------------------------------------
Thu Jun 13 23:11:33 UTC 2013 - jengelh@inai.de
- Rename db_ binaries to db48_ to make room for libdb-6_0
- Add conflict markers against libdb-4_5 (overlapping files)
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 17 12:01:29 CET 2012 - ro@suse.de Sat Nov 17 12:01:29 CET 2012 - ro@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package libdb-4_8 # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -27,7 +27,8 @@ Release: 0
Summary: Berkeley DB Database Library Version 4.8 Summary: Berkeley DB Database Library Version 4.8
License: BSD-3-Clause License: BSD-3-Clause
Group: System/Libraries Group: System/Libraries
Url: http://www.sleepycat.com Url: http://oracle.com/technetwork/products/berkeleydb/
Source: db-%{version}.tar.bz2 Source: db-%{version}.tar.bz2
Source1: %{name}.changes Source1: %{name}.changes
Source9: getpatches Source9: getpatches
@ -48,18 +49,18 @@ database support for applications.
This package contains the necessary runtime libraries. This package contains the necessary runtime libraries.
%package -n db-utils %package -n db48-utils
Summary: Command Line tools for Managing Berkeley DB Databases Summary: Command Line tools for Managing Berkeley DB Databases
Group: Productivity/Databases/Tools Group: Productivity/Databases/Tools
%description -n db-utils %description -n db48-utils
The Berkeley DB Database is a programmatic toolkit that provides The Berkeley DB Database is a programmatic toolkit that provides
database support for applications. database support for applications.
This package contains the command line tools for managing Berkeley DB This package contains the command line tools for managing Berkeley DB
databases. databases.
%package -n db-doc %package -n db48-doc
Summary: Documentation for Berkeley DB Summary: Documentation for Berkeley DB
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: db-utils-doc = %{version} Provides: db-utils-doc = %{version}
@ -67,7 +68,7 @@ Provides: db-utils-doc = %{version}
BuildArch: noarch BuildArch: noarch
%endif %endif
%description -n db-doc %description -n db48-doc
The Berkeley DB Database is a programmatic toolkit that provides The Berkeley DB Database is a programmatic toolkit that provides
database support for applications. database support for applications.
@ -78,7 +79,7 @@ Summary: Development Files and Libraries for the Berkeley DB library Vers
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: glibc-devel Requires: glibc-devel
Provides: db-devel = %{version} Conflicts: libdb-4_5-devel
%description devel %description devel
The Berkeley DB Database is a programmatic toolkit that provides The Berkeley DB Database is a programmatic toolkit that provides
@ -166,6 +167,12 @@ mv %{buildroot}/%{docdir}/collections/tutorial %{buildroot}/%{docdir}/
# Remove crappy *.la files # Remove crappy *.la files
rm -rf %{buildroot}%{_libdir}/*.la rm -rf %{buildroot}%{_libdir}/*.la
rm -rf %{buildroot}%{_libdir}/tls/*.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}%{_libdir}
%fdupes %{buildroot}%{docdir} %fdupes %{buildroot}%{docdir}
@ -178,7 +185,7 @@ rm -rf %{buildroot}%{_libdir}/tls/*.la
%{_libdir}/libdb-%{major}.%{minor}.so %{_libdir}/libdb-%{major}.%{minor}.so
%{_libdir}/libdb_cxx-%{major}.%{minor}.so %{_libdir}/libdb_cxx-%{major}.%{minor}.so
%files -n db-doc %files -n db48-doc
%defattr(-,root,root) %defattr(-,root,root)
%dir %{docdir} %dir %{docdir}
%doc %{docdir}/LICENSE %doc %{docdir}/LICENSE
@ -194,20 +201,20 @@ rm -rf %{buildroot}%{_libdir}/tls/*.la
%doc %{docdir}/programmer_reference %doc %{docdir}/programmer_reference
%doc %{docdir}/tutorial %doc %{docdir}/tutorial
%files -n db-utils %files -n db48-utils
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/db_archive %{_bindir}/db48_archive
%{_bindir}/db_checkpoint %{_bindir}/db48_checkpoint
%{_bindir}/db_deadlock %{_bindir}/db48_deadlock
%{_bindir}/db_dump %{_bindir}/db48_dump
%{_bindir}/db_load %{_bindir}/db48_hotbackup
%{_bindir}/db_printlog %{_bindir}/db48_load
%{_bindir}/db_recover %{_bindir}/db48_printlog
%{_bindir}/db_sql %{_bindir}/db48_recover
%{_bindir}/db_stat %{_bindir}/db48_sql
%{_bindir}/db_upgrade %{_bindir}/db48_stat
%{_bindir}/db_verify %{_bindir}/db48_upgrade
%{_bindir}/db_hotbackup %{_bindir}/db48_verify
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jun 13 23:11:33 UTC 2013 - jengelh@inai.de
- Add conflict markers against libdb-4_5 (overlapping files)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 9 12:08:54 UTC 2012 - aj@suse.de Mon Jan 9 12:08:54 UTC 2012 - aj@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package libdb_java-4_8 # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -27,7 +27,8 @@ Release: 0
Summary: Java Bindings for the Berkeley DB Summary: Java Bindings for the Berkeley DB
License: BSD-3-Clause License: BSD-3-Clause
Group: Productivity/Databases/Servers Group: Productivity/Databases/Servers
Url: http://www.sleepycat.com Url: http://oracle.com/technetwork/products/berkeleydb/
Source: db-%{version}.tar.bz2 Source: db-%{version}.tar.bz2
Source1: %{name}.changes Source1: %{name}.changes
Source9: getpatches Source9: getpatches
@ -40,6 +41,7 @@ BuildRequires: update-alternatives
Requires: libdb-%{major}_%{minor} = %{version} Requires: libdb-%{major}_%{minor} = %{version}
Provides: db-java = %{version} Provides: db-java = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Conflicts: libdb_java-4_5
%description %description
These are the Java bindings for the Berkeley DB. They are needed for These are the Java bindings for the Berkeley DB. They are needed for
@ -51,6 +53,7 @@ Group: Productivity/Databases/Servers
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: glibc-devel Requires: glibc-devel
Provides: db-java-devel = %{version} Provides: db-java-devel = %{version}
Conflicts: libdb_java-4_5-devel
%description devel %description devel
These are the Java bindings for the Berkeley DB. They are needed for These are the Java bindings for the Berkeley DB. They are needed for