From 52330dabe189008d8d4073561ffcd0f3f8daa3d11c1c64ae23ffd7eb74c166ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 5 Sep 2017 20:09:37 +0000 Subject: [PATCH] Accepting request 521127 from home:jengelh:branches:multimedia:libs - Remove --with-pic (only useful for static libs) and compact --enable-static=n. - Change description to reflect the package content. - Remove %package libcdio_{cdda,paranoia} since they are always produced by a separate SRPM. OBS-URL: https://build.opensuse.org/request/show/521127 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libcdio?expand=0&rev=47 --- cdio-utils.changes | 7 ++++ cdio-utils.spec | 11 ++---- libcdio.changes | 9 +++++ libcdio.spec | 96 +++++++++++++++------------------------------- 4 files changed, 50 insertions(+), 73 deletions(-) diff --git a/cdio-utils.changes b/cdio-utils.changes index 2202750..cad1b79 100644 --- a/cdio-utils.changes +++ b/cdio-utils.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Sep 5 12:02:14 UTC 2017 - jengelh@inai.de + +- Remove --with-pic (only useful for static libs) and compact + --enable-static=n. +- Change description to reflect the package content. + ------------------------------------------------------------------- Sun Sep 3 10:50:45 UTC 2017 - astieger@suse.com diff --git a/cdio-utils.spec b/cdio-utils.spec index c59b849..7c0312c 100644 --- a/cdio-utils.spec +++ b/cdio-utils.spec @@ -20,7 +20,7 @@ Name: cdio-utils Version: 0.94 Release: 0 -Summary: CD-ROM Access Library +Summary: Utility programs making use of libcdio, a CD-ROM access library License: GPL-3.0+ Group: Productivity/Multimedia/Other Url: https://savannah.gnu.org/projects/libcdio @@ -43,9 +43,8 @@ Provides: libcdio-utils = %{version} Obsoletes: libcdio-utils < %{version} %description -This library encapsulates CD-ROM reading and control. Applications -wanting to be oblivious to the OS and device-dependent properties of a -CD-ROM can use this library. +This package contains a number of utility programs that make use of +libcdio. %prep %setup -q -n libcdio-%{version} @@ -60,9 +59,7 @@ VCDINFO_CFLAGS=-I%{_includedir}/libvcd VCDINFO_LIBS="-L%{_libdir} -lvcdinfo -L%{ -L%{buildir}/lib/driver/.libs -lcdio" \ %configure \ --disable-rpath \ - --enable-static=n \ - --enable-shared=yes \ - --with-pic \ + --disable-static \ --disable-cxx \ --enable-vcd-info=yes diff --git a/libcdio.changes b/libcdio.changes index 626128e..2a0befe 100644 --- a/libcdio.changes +++ b/libcdio.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Sep 5 12:02:14 UTC 2017 - jengelh@inai.de + +- Remove %package libcdio_{cdda,paranoia} since they are always + produced by a separate SRPM. +- Remove --with-pic (only useful for static libs) and compact + --enable-static=n. +- Adjust RPM groups. Diversify descriptions for the subpackages. + ------------------------------------------------------------------- Sun Sep 3 10:50:45 UTC 2017 - astieger@suse.com diff --git a/libcdio.spec b/libcdio.spec index 84ce141..d5fa419 100644 --- a/libcdio.spec +++ b/libcdio.spec @@ -17,7 +17,6 @@ %define cdioutils 0 -%define build_paranoia 0 %define cdio_soname 16 Name: libcdio Version: 0.94 @@ -45,66 +44,46 @@ BuildRequires: makeinfo %endif %description -This library encapsulates CD-ROM reading and control. Applications -wanting to be oblivious to the OS and device-dependent properties of a -CD-ROM can use this library. +The libcdio package contains libraries for CD-ROM and CD image +access. Applications can use them as an abstraction to OS- and +device-dependent properties of a CD-ROM or of the specific details of +various CD image formats. %package -n libcdio%{cdio_soname} Summary: CD-ROM Access Library -Group: Productivity/Multimedia/Other +Group: System/Libraries %description -n libcdio%{cdio_soname} -This library encapsulates CD-ROM reading and control. Applications -wanting to be oblivious to the OS and device-dependent properties of a -CD-ROM can use this library. +The libcdio package contains libraries for CD-ROM and CD image +access. Applications can use them as an abstraction to OS- and +device-dependent properties of a CD-ROM or of the specific details of +various CD image formats. -%if %{build_paranoia} == 1 -%package -n libcdio_cdda1 -Summary: CD-ROM Access Library -Group: Productivity/Multimedia/Other - -%description -n libcdio_cdda1 -This library encapsulates CD-ROM reading and control. Applications -wanting to be oblivious to the OS and device-dependent properties of a -CD-ROM can use this library. - -%package -n libcdio_paranoia1 -Summary: CD-ROM Access Library -Group: Productivity/Multimedia/Other - -%description -n libcdio_paranoia1 -This library encapsulates CD-ROM reading and control. Applications -wanting to be oblivious to the OS and device-dependent properties of a -CD-ROM can use this library. - -%endif +This subpackage contains the C API library from cdio. %package -n libcdio++0 -Summary: CD-ROM Access Library -Group: Productivity/Multimedia/Other +Summary: C++ API for the libcdio CD-ROM access library +Group: System/Libraries %description -n libcdio++0 -This library encapsulates CD-ROM reading and control. Applications -wanting to be oblivious to the OS and device-dependent properties of a -CD-ROM can use this library. +The libcdio package contains libraries for CD-ROM and CD image +access. + +This subpackage contains the C++ API library for cdio. %package -n libiso9660-10 -Summary: CD-ROM Access Library -Group: Productivity/Multimedia/Other +Summary: Library for working with ISO 9660 filesystems +Group: System/Libraries %description -n libiso9660-10 -This library encapsulates CD-ROM reading and control. Applications -wanting to be oblivious to the OS and device-dependent properties of a -CD-ROM can use this library. +A library for working with ISO 9660 filesystems. %package -n libudf0 -Summary: CD-ROM Access Library -Group: Productivity/Multimedia/Other +Summary: Library for working with Universal Disk Format filesystems +Group: System/Libraries %description -n libudf0 -This library encapsulates CD-ROM reading and control. Applications -wanting to be oblivious to the OS and device-dependent properties of a -CD-ROM can use this library. +A library for working with UDF filesystems. %package devel Summary: CD-ROM access library @@ -116,15 +95,15 @@ Requires: libiso9660-10 = %{version} Requires: libudf0 = %{version} Requires(post): %{install_info_prereq} Requires(preun): %{install_info_prereq} -%if %{build_paranoia} == 1 -Requires: libcdio_cdda1 = %{version} -Requires: libcdio_paranoia1 = %{version} -%endif %description devel -This library encapsulates CD-ROM reading and control. Applications -wanting to be oblivious to the OS and device-dependent properties of a -CD-ROM can use this library. +The libcdio package contains libraries for CD-ROM and CD image +access. Applications can use them as an abstraction to OS- and +device-dependent properties of a CD-ROM or of the specific details of +various CD image formats. + +This subpackage contains libraries and header files for developing +applications that want to make use of the cdio libraries. %prep %setup -q @@ -134,9 +113,7 @@ CD-ROM can use this library. %build %configure \ --disable-rpath \ - --enable-static=n \ - --enable-shared=yes \ - --with-pic \ + --disable-static \ --enable-rock \ --without-cd-drive \ --without-cd-info \ @@ -192,17 +169,4 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_libdir}/libudf*.so %{_libdir}/pkgconfig/*.pc -%if %{build_paranoia} == 1 -%post -n libcdio_cdda1 -p /sbin/ldconfig -%post -n libcdio_paranoia1 -p /sbin/ldconfig -%postun -n libcdio_cdda1 -p /sbin/ldconfig -%postun -n libcdio_paranoia1 -p /sbin/ldconfig - -%files -n libcdio_cdda1 -%{_libdir}/libcdio_cdda.so.* - -%files -n libcdio_paranoia1 -%{_libdir}/libcdio_paranoia.so.* -%endif - %changelog