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
This commit is contained in:
Matej Cepl 2021-06-08 12:15:08 +00:00 committed by Git OBS Bridge
parent a40fdaa66a
commit 77506f876c
4 changed files with 29 additions and 31 deletions

View File

@ -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 <jengelh@inai.de>
- 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

View File

@ -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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jun 7 15:02:24 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
- Drop --with-pic (no effect with --disable-static)
- Trim old/redundant rpm constructs
-------------------------------------------------------------------
Thu Apr 11 14:17:46 UTC 2013 - mmeister@suse.com

View File

@ -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