From d8de2f0ce96840860ca9cf68d5451c109947b928068304ab78051d4d1d583e31 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 5 Feb 2012 16:37:14 +0000 Subject: [PATCH 1/3] Remove redundant tags/sections OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/gdbm?expand=0&rev=16 --- gdbm.changes | 6 ++++++ gdbm.spec | 31 +++++++++++-------------------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/gdbm.changes b/gdbm.changes index 2f63062..daea5d7 100644 --- a/gdbm.changes +++ b/gdbm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Feb 5 16:36:13 UTC 2012 - jengelh@medozas.de + +- Remove redundant tags/sections +- Replace /usr/%_lib by simpler %_libdir + ------------------------------------------------------------------- Sat Oct 1 05:39:11 UTC 2011 - coolo@suse.com diff --git a/gdbm.spec b/gdbm.spec index eee9df3..a240a59 100644 --- a/gdbm.spec +++ b/gdbm.spec @@ -1,7 +1,7 @@ # # spec file for package gdbm # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,24 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: gdbm Url: http://directory.fsf.org/GNU/gdbm.html #!BuildIgnore: man -Prefix: /usr -License: GPLv2+ -Group: System/Libraries -AutoReqProv: on # bug437293 %ifarch ppc64 Obsoletes: gdbm-64bit %endif # Version: 1.8.3 -Release: 383 +Release: 0 Summary: GNU Database Routines +License: GPL-2.0+ +Group: System/Libraries Source: ftp://prep.ai.mit.edu/gnu/gdbm/gdbm-%{version}.tar.bz2 Source2: baselibs.conf Patch: gdbm-%{version}.dif @@ -49,13 +44,12 @@ A static and dynamic library for the GNU database routines. %package devel -License: GPLv2+ ; LGPLv2.1+ Summary: Include Files and Libraries mandatory for Development +License: GPL-2.0+ ; LGPL-2.1+ Group: Development/Libraries/C and C++ Requires: gdbm = %{version} Provides: gdbm:/usr/lib/libgdbm.so PreReq: %install_info_prereq -AutoReqProv: on # bug437293 %ifarch ppc64 Obsoletes: gdbm-devel-64bit @@ -97,14 +91,11 @@ make install-compat INSTALL_ROOT=$RPM_BUILD_ROOT echo "/* GNU ld script Use the shared library, but some functions are only in the static library, so try that secondarily. */ -GROUP ( /usr/%{_lib}/libgdbm.so /usr/%{_lib}/libgdbm_compat.so )" > $RPM_BUILD_ROOT/%{_libdir}/libndbm.so +GROUP ( %_libdir/libgdbm.so %_libdir/libgdbm_compat.so )" > $RPM_BUILD_ROOT/%{_libdir}/libndbm.so echo "/* GNU ld script Use the shared library, but some functions are only in the static library, so try that secondarily. */ -GROUP ( /usr/%{_lib}/libgdbm.a /usr/%{_lib}/libgdbm_compat.a )" > $RPM_BUILD_ROOT/%{_libdir}/libndbm.a - -%clean -rm -rf $RPM_BUILD_ROOT +GROUP ( %_libdir/libgdbm.a %_libdir/libgdbm_compat.a )" > $RPM_BUILD_ROOT/%{_libdir}/libndbm.a %post -p /sbin/ldconfig @@ -113,10 +104,10 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc COPYING README NEWS -%{_prefix}/%{_lib}/libgdbm.so.3 -%{_prefix}/%{_lib}/libgdbm.so.3.0.0 -%{_prefix}/%{_lib}/libgdbm_compat.so.3 -%{_prefix}/%{_lib}/libgdbm_compat.so.3.0.0 +%_libdir/libgdbm.so.3 +%_libdir/libgdbm.so.3.0.0 +%_libdir/libgdbm_compat.so.3 +%_libdir/libgdbm_compat.so.3.0.0 %files devel %defattr(-,root,root) From 0da2a06c13de34ff1d9055cb184ca77a40d8871a6c03b8cac01fff14f2c25f01 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Mon, 6 Feb 2012 15:39:31 +0000 Subject: [PATCH 2/3] Accepting request 102917 from home:jengelh:branches:devel:libraries:c_c++ - Name library package according to shlib policy - Update description, source text from GNU homepage OBS-URL: https://build.opensuse.org/request/show/102917 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/gdbm?expand=0&rev=17 --- gdbm.changes | 6 ++++++ gdbm.spec | 48 +++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/gdbm.changes b/gdbm.changes index daea5d7..219eb7c 100644 --- a/gdbm.changes +++ b/gdbm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Feb 5 17:48:43 UTC 2012 - jengelh@medozas.de + +- Name library package according to shlib policy +- Update description, source text from GNU homepage + ------------------------------------------------------------------- Sun Feb 5 16:36:13 UTC 2012 - jengelh@medozas.de diff --git a/gdbm.spec b/gdbm.spec index a240a59..c09ca16 100644 --- a/gdbm.spec +++ b/gdbm.spec @@ -16,6 +16,7 @@ # Name: gdbm +%define lname libgdbm3 Url: http://directory.fsf.org/GNU/gdbm.html #!BuildIgnore: man # bug437293 @@ -25,7 +26,7 @@ Obsoletes: gdbm-64bit # Version: 1.8.3 Release: 0 -Summary: GNU Database Routines +Summary: GNU dbm key/data database License: GPL-2.0+ Group: System/Libraries Source: ftp://prep.ai.mit.edu/gnu/gdbm/gdbm-%{version}.tar.bz2 @@ -39,9 +40,46 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libtool %description -A static and dynamic library for the GNU database routines. +GNU dbm is a library of database functions that use extensible +hashing and work similar to the standard UNIX dbm. These routines are +provided to a programmer needing to create and manipulate a hashed +database. +The basic use of GDBM is to store key/data pairs in a data file. Each +key must be unique and each key is paired with only one data item. +The library provides primitives for storing key/data pairs, searching +and retrieving the data by its key and deleting a key along with its +data. It also support sequential iteration over all key/data pairs in +a database. + +For compatibility with programs using old UNIX dbm function, the +package also provides traditional dbm and ndbm interfaces. + +%package -n %lname +Summary: GNU dbm key/data database +License: GPL-2.0+ +Group: System/Libraries +# O/P added in 12.2 +Obsoletes: gdbm < %version-%release +Provides: gdbm = %version-%release + +%description -n %lname +GNU dbm is a library of database functions that use extensible +hashing and work similar to the standard UNIX dbm. These routines are +provided to a programmer needing to create and manipulate a hashed +database. + +The basic use of GDBM is to store key/data pairs in a data file. Each +key must be unique and each key is paired with only one data item. + +The library provides primitives for storing key/data pairs, searching +and retrieving the data by its key and deleting a key along with its +data. It also support sequential iteration over all key/data pairs in +a database. + +For compatibility with programs using old UNIX dbm function, the +package also provides traditional dbm and ndbm interfaces. %package devel Summary: Include Files and Libraries mandatory for Development @@ -97,11 +135,11 @@ echo "/* GNU ld script the static library, so try that secondarily. */ GROUP ( %_libdir/libgdbm.a %_libdir/libgdbm_compat.a )" > $RPM_BUILD_ROOT/%{_libdir}/libndbm.a -%post -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig -%files +%files -n %lname %defattr(-,root,root) %doc COPYING README NEWS %_libdir/libgdbm.so.3 From a3a9791ce8a72f58c24374e8cd460b1199a9903638fceddc54f991b7725110c4 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 7 Feb 2012 08:02:17 +0000 Subject: [PATCH 3/3] - fix baselibs.conf OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/gdbm?expand=0&rev=18 --- baselibs.conf | 4 +++- gdbm.changes | 5 +++++ gdbm.spec | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/baselibs.conf b/baselibs.conf index c1c7d10..9dcecc8 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,4 @@ -gdbm +libgdbm3 gdbm-devel + requires -gdbm- + requires "libgdbm3- = " diff --git a/gdbm.changes b/gdbm.changes index 219eb7c..7ddb6f0 100644 --- a/gdbm.changes +++ b/gdbm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 7 08:02:10 UTC 2012 - coolo@suse.com + +- fix baselibs.conf + ------------------------------------------------------------------- Sun Feb 5 17:48:43 UTC 2012 - jengelh@medozas.de diff --git a/gdbm.spec b/gdbm.spec index c09ca16..24b8d59 100644 --- a/gdbm.spec +++ b/gdbm.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: gdbm %define lname libgdbm3 Url: http://directory.fsf.org/GNU/gdbm.html