From d8de2f0ce96840860ca9cf68d5451c109947b928068304ab78051d4d1d583e31 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 5 Feb 2012 16:37:14 +0000 Subject: [PATCH] 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)