From 77506f876c1b5c78fcbde2c4c4f3aed250395e5d0f1275f7a48b20bfea632906 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 8 Jun 2021 12:15:08 +0000 Subject: [PATCH] Accepting request 898225 from home:jengelh:pic - Drop --with-pic (no effect with --disable-static) - Trim old/redundant rpm constructs OBS-URL: https://build.opensuse.org/request/show/898225 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libcddb?expand=0&rev=22 --- libcddb-utils.changes | 8 +++++++- libcddb-utils.spec | 23 ++++++++--------------- libcddb.changes | 6 ++++++ libcddb.spec | 23 ++++++++--------------- 4 files changed, 29 insertions(+), 31 deletions(-) diff --git a/libcddb-utils.changes b/libcddb-utils.changes index 716d6c3..9f06f68 100644 --- a/libcddb-utils.changes +++ b/libcddb-utils.changes @@ -1,5 +1,11 @@ ------------------------------------------------------------------- -Thu Apr 11 14:17:58 UTC 2013 - mmeister@suse.com +Mon Jun 7 15:02:24 UTC 2021 - Jan Engelhardt + +- Drop --with-pic (no effect with --disable-static) +- Trim old/redundant rpm constructs + +------------------------------------------------------------------- +Thu Apr 11 14:17:46 UTC 2013 - mmeister@suse.com - Added url as source. Please see http://en.opensuse.org/SourceUrls diff --git a/libcddb-utils.spec b/libcddb-utils.spec index 012b5fe..e8affad 100644 --- a/libcddb-utils.spec +++ b/libcddb-utils.spec @@ -1,7 +1,7 @@ # # spec file for package libcddb-utils # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -25,9 +25,9 @@ Name: libcddb-utils %define _name libcddb Version: 1.3.2 Release: 0 -Url: http://libcddb.sourceforge.net/ +URL: http://libcddb.sourceforge.net/ Summary: CDDB Access Library Utilities -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Productivity/Multimedia/Other %if %BUILD_CORE # bug437293 @@ -38,7 +38,6 @@ Obsoletes: libcddb-64bit Source: http://downloads.sourceforge.net/project/%{_name}/%{_name}/%{version}/%{_name}-%{version}.tar.bz2 Source1: %{_name}_spec-prepare.sh Source2: baselibs.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libtool BuildRequires: pkg-config %if %BUILD_UTILS @@ -117,26 +116,22 @@ sed -i 's:\(\.\.\|\$(top_builddir)\)/[^/]*/lib\([^ ]*\)\.la:-l\2:g' */Makefile.a autoreconf -f -i %configure\ --disable-rpath\ - --disable-static\ - --with-pic + --disable-static %if !%BUILD_CORE cd examples %endif -make %{?jobs:-j%jobs} +%make_build %install %if !%BUILD_CORE cd examples %endif -make DESTDIR=$RPM_BUILD_ROOT install -%{__rm} -f %{buildroot}%{_libdir}/libcddb.la +%make_install +rm -f %{buildroot}%{_libdir}/libcddb.la -%clean -rm -rf $RPM_BUILD_ROOT %if %BUILD_UTILS %files -n libcddb-utils -%defattr (-, root, root) %{_bindir}/* %endif %if %BUILD_CORE @@ -146,11 +141,9 @@ rm -rf $RPM_BUILD_ROOT %postun -n libcddb2 -p /sbin/ldconfig %files -n libcddb2 -%defattr (-, root, root) %{_libdir}/*.so.2* %files devel -%defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc diff --git a/libcddb.changes b/libcddb.changes index d10d9e9..9f06f68 100644 --- a/libcddb.changes +++ b/libcddb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 7 15:02:24 UTC 2021 - Jan Engelhardt + +- Drop --with-pic (no effect with --disable-static) +- Trim old/redundant rpm constructs + ------------------------------------------------------------------- Thu Apr 11 14:17:46 UTC 2013 - mmeister@suse.com diff --git a/libcddb.spec b/libcddb.spec index fb40896..23859e7 100644 --- a/libcddb.spec +++ b/libcddb.spec @@ -1,7 +1,7 @@ # # spec file for package libcddb # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -25,9 +25,9 @@ Name: libcddb %define _name libcddb Version: 1.3.2 Release: 0 -Url: http://libcddb.sourceforge.net/ +URL: http://libcddb.sourceforge.net/ Summary: CDDB Access Library Utilities -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Productivity/Multimedia/Other %if %BUILD_CORE # bug437293 @@ -38,7 +38,6 @@ Obsoletes: libcddb-64bit Source: http://downloads.sourceforge.net/project/%{_name}/%{_name}/%{version}/%{_name}-%{version}.tar.bz2 Source1: %{_name}_spec-prepare.sh Source2: baselibs.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libtool BuildRequires: pkg-config %if %BUILD_UTILS @@ -117,26 +116,22 @@ sed -i 's:\(\.\.\|\$(top_builddir)\)/[^/]*/lib\([^ ]*\)\.la:-l\2:g' */Makefile.a autoreconf -f -i %configure\ --disable-rpath\ - --disable-static\ - --with-pic + --disable-static %if !%BUILD_CORE cd examples %endif -make %{?jobs:-j%jobs} +%make_build %install %if !%BUILD_CORE cd examples %endif -make DESTDIR=$RPM_BUILD_ROOT install -%{__rm} -f %{buildroot}%{_libdir}/libcddb.la +%make_install +rm -f %{buildroot}%{_libdir}/libcddb.la -%clean -rm -rf $RPM_BUILD_ROOT %if %BUILD_UTILS %files -n libcddb-utils -%defattr (-, root, root) %{_bindir}/* %endif %if %BUILD_CORE @@ -146,11 +141,9 @@ rm -rf $RPM_BUILD_ROOT %postun -n libcddb2 -p /sbin/ldconfig %files -n libcddb2 -%defattr (-, root, root) %{_libdir}/*.so.2* %files devel -%defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc