Accepting request 312462 from multimedia:libs

1

OBS-URL: https://build.opensuse.org/request/show/312462
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcdio?expand=0&rev=38

cdio-utils.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jun 16 11:14:07 UTC 2015 - mpluskal@suse.com
+
+- Add gpg signature
+- Remove ppc obsoletes/provides as it affects unsupported releases
+- Cleanup spec file with spec-cleaner
+
 -------------------------------------------------------------------
 Sat Jan 31 15:43:30 UTC 2015 - p.drouand@gmail.com
 

cdio-utils.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package cdio-utils
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX 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,11 +15,19 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-%define cdioutils 1
 
+%define cdioutils 1
 Name:           cdio-utils
 Version:        0.93
 Release:        0
+Summary:        CD-ROM Access Library
+License:        GPL-3.0+
+Group:          Productivity/Multimedia/Other
+Url:            https://savannah.gnu.org/projects/libcdio
+Source0:        https://ftp.gnu.org/gnu/libcdio/libcdio-%{version}.tar.gz
+Source1:        https://ftp.gnu.org/gnu/libcdio/libcdio-%{version}.tar.gz.sig
+Source2:        libcdio.keyring
+Source4:        baselibs.conf
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  help2man
@@ -30,25 +38,12 @@ BuildRequires:  pkg-config
 BuildRequires:  popt-devel
 BuildRequires:  pkgconfig(libcddb)
 BuildRequires:  pkgconfig(libvcdinfo)
-%if 0%{suse_version} > 1220
-BuildRequires:  makeinfo
-%endif
-Url:            http://savannah.gnu.org/projects/libcdio
-Summary:        CD-ROM Access Library
-License:        GPL-3.0+
-Group:          Productivity/Multimedia/Other
-# http://ftp.gnu.org/gnu/libcdio/
-Source0:        libcdio-%{version}.tar.gz
-Source1:        baselibs.conf
-# bug437293
-%ifarch ppc64
-Obsoletes:      libcdio-64bit
-%endif
-#
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
 Provides:       libcdio-utils = %{version}
 Obsoletes:      libcdio-utils < %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} > 1220
+BuildRequires:  makeinfo
+%endif
 
 %description
 This library encapsulates CD-ROM reading and control. Applications
@@ -57,6 +52,7 @@ CD-ROM can use this library.
 
 %prep
 %setup -q -n libcdio-%{version}
+
 %define buildir ${PWD}
 
 %build
@@ -77,13 +73,13 @@ VCDINFO_CFLAGS=-I%{_includedir}/libvcd VCDINFO_LIBS="-L%{_libdir} -lvcdinfo -L%{
 
 VCDINFO_CFLAGS=-I%{_includedir}/libvcd VCDINFO_LIBS="-L%{_libdir} -lvcdinfo \
 -L%{buildir}/lib/iso9660/.libs/ -liso9660 -L%{buildir}/lib/driver/.libs/ -lcdio" \
- VERBOSE=1 make -e %{?jobs:-j%jobs}
+ VERBOSE=1 make -e %{?_smp_mflags}
 #-lcdioutils
 
 %install
-%makeinstall
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 %if 1 == 0
-mv $RPM_BUILD_ROOT%{_mandir}/jp $RPM_BUILD_ROOT%{_mandir}/ja
+mv %{buildroot}%{_mandir}/jp %{buildroot}%{_mandir}/ja
 %endif
 #empty depdendency libs
 rm -rf %{buildroot}%{_libdir} %{buildroot}%{_includedir} %{buildroot}%{_infodir}
@@ -97,9 +93,9 @@ rm -rf %{buildroot}%{_libdir} %{buildroot}%{_includedir} %{buildroot}%{_infodir}
 %{_bindir}/cdda-*
 %{_bindir}/iso-*
 %{_bindir}/mmc-*
-%doc %{_mandir}/man?/*.*
+%{_mandir}/man?/*.*
 %if 1 == 0
-%lang(ja) %doc %{_mandir}/ja/man?/*.*
+%lang(ja) %{_mandir}/ja/man?/*.*
 %endif
 
 %changelog

libcdio-0.93.tar.gz.sig

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iEYEABECAAYFAlQpeWcACgkQGo3lAIJ17CEVQwCgm2VxcQQlAVSTWenDimpsYM9e
+eaUAnj+5djKJJDmKTROgIhPl9psBWUbh
+=ZjjN
+-----END PGP SIGNATURE-----

libcdio.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Jun 16 11:10:43 UTC 2015 - mpluskal@suse.com
+
+- Add gpg signature
+- Remove ppc obsoletes/provides as it affects unsupported releases
+- Cleanup spec file with spec-cleaner
+- Add missing info dependencies, use preun instead of postun for 
+  scriplet
+
 -------------------------------------------------------------------
 Sat Jan 31 15:52:35 UTC 2015 - p.drouand@gmail.com
 

libcdio.keyring

@@ -0,0 +1,26 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+mQGiBDs1Z2QRBAClcQILf2cKYMjwgEaQ8wg0smWsfEsit1YEjW0w+PTp67Uz7xSR
+MhpHGw2vhxT0aStf7SuGJfHTxfte35kEjExNZiaqw1DN/TsOJriLrO10kpbFx8El
+JIAuhdMhrNoOPrAXUTw6QFijuJZqWzCdwDOlqVcNsZxFMf+AwrLOt6tAvwCgpcZS
+NLneNOiohbBioaMwkWDmXmsD+gKS+Gq4OANc4x5WjOoYFK+CK2pJhWCIQV9ZL2Gt
+j/KnoZMR4MdgMaiD5kBpxEJ6FWJa4l5DyA7zq+h2EzlskFAOV2dKSpS1CSOSiGBE
+8v+J3zhgycz5jWDNBfxY8pCX7ClIItbdGDVt8zQr7bXsS19a5kcKeh7+B+QknqoV
+YV93A/0b2beR9NOtIrsGvLH8qno7t+CTlwFgBluvSFz/ogxekSl7K11Hgvj8sr/s
+vBDjPQMSBMI/qs1zSF6YqxaNDWhPLxKJ/ffbo+iRWsq1KHcXsVbxxTNVg4VHKpG3
+dPZZcomNrdkb515uj5qzyLXG2efisabCWzod4AFnNnQNDMQmaLQeUi4gQmVybnN0
+ZWluIDxyb2NreUBwYW5peC5jb20+iFcEExECABcFAjs1Z2QFCwcKAwQDFQMCAxYC
+AQIXgAAKCRAajeUAgnXsIQZ1AJ4l2ZUepgqGBnElf6BXIUtgVwrdBgCfYMt18QXH
+xL5W7RCMtaGGlTq1Ca+IXwQTEQIAFwUCOzVnZAULBwoDBAMVAwIDFgIBAheAABIJ
+EBqN5QCCdewhB2VHUEcAAQEGdQCeJdmVHqYKhgZxJX+gVyFLYFcK3QYAn2DLdfEF
+x8S+Vu0QjLWhhpU6tQmvuQENBDs1Z2cQBACcUfTqcD9SIuyNvAbuWbAH3FSFK43O
+JdCSGWUP0c8VgJEv4LYlZRxGFv9NR0D1PcSJPjSJdtn2YHO1mVM3ehA1LHeYnb8V
+HZO/a55EcUu5Pzbes+LW4UEzsTE1+GCVrK0UIp1TjqaFJSerTnSaq+YlFrY3qh/l
+IB9uPSoZEV8IUwADBQP9FMaRDJ3oVlsZAxRaXwxWTlwKT8UuR4tzU1KSCw5s7aG8
+VnQccJ0nma73mjLOxaARkroKOFccphFhhxdylX4SS6sT5LSMjNJ+TsduC08UucWD
+/D8qO27ylbx1+vOy6pdtcdZJ2MySrorRZkmfMI+WDj61SYGuiwGediAO//zEn2uI
+TgQYEQIABgUCOzVnZwASCRAajeUAgnXsIQdlR1BHAAEB8TAAmwYnEkyGp24AW8kt
+8jeTEL0KF2RfAJwN/WSXylvKG+0Hg2HarfsglwXZrg==
+=jzAV
+-----END PGP PUBLIC KEY BLOCK-----

libcdio.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libcdio
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,10 +19,17 @@
 %define cdioutils 0
 %define build_paranoia 0
 %define cdio_soname 16
-
 Name:           libcdio
 Version:        0.93
 Release:        0
+Summary:        CD-ROM Access Library
+License:        GPL-3.0+
+Group:          Productivity/Multimedia/Other
+Url:            https://savannah.gnu.org/projects/libcdio
+Source0:        https://ftp.gnu.org/gnu/libcdio/%{name}-%{version}.tar.gz
+Source1:        https://ftp.gnu.org/gnu/libcdio/%{name}-%{version}.tar.gz.sig
+Source2:        %{name}.keyring
+Source3:        baselibs.conf
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  help2man
@@ -31,35 +38,21 @@ BuildRequires:  ncurses-devel
 BuildRequires:  pkg-config
 BuildRequires:  popt-devel
 BuildRequires:  pkgconfig(libcddb)
-%if 0%{suse_version} > 1220
+Requires(preun): %{install_info_prereq}
+Requires(post): %{install_info_prereq}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} > 1220
 BuildRequires:  makeinfo
 %endif
-Url:            http://savannah.gnu.org/projects/libcdio
-Summary:        CD-ROM Access Library
-License:        GPL-3.0+
-Group:          Productivity/Multimedia/Other
-Source0:        http://ftp.gnu.org/gnu/libcdio/%{name}-%{version}.tar.gz
-Source1:        baselibs.conf
-# bug437293
-%ifarch ppc64
-Obsoletes:      libcdio-64bit
-%endif
-#
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %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.
 
-
 %package -n libcdio%{cdio_soname}
 Summary:        CD-ROM Access Library
 Group:          Productivity/Multimedia/Other
-# bug437293
-%ifarch ppc64
-Obsoletes:      libcdio-64bit
-%endif
 #
 # Name for <= 10.2
 Obsoletes:      libcdio <= 0.78.2
@@ -70,31 +63,19 @@ 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.
 
-
 %if %{build_paranoia} == 1
 %package -n libcdio_cdda1
 Summary:        CD-ROM Access Library
 Group:          Productivity/Multimedia/Other
-# bug437293
-%ifarch ppc64
-Obsoletes:      libcdio-64bit
-%endif
-#
 
 %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
-# bug437293
-%ifarch ppc64
-Obsoletes:      libcdio-64bit
-%endif
-#
 
 %description -n libcdio_paranoia1
 This library encapsulates CD-ROM reading and control. Applications
@@ -106,41 +87,24 @@ CD-ROM can use this library.
 %package -n libcdio++0
 Summary:        CD-ROM Access Library
 Group:          Productivity/Multimedia/Other
-# bug437293
-%ifarch ppc64
-Obsoletes:      libcdio-64bit
-%endif
-#
 
 %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.
 
-
 %package -n libiso9660-10
 Summary:        CD-ROM Access Library
 Group:          Productivity/Multimedia/Other
-# bug437293
-%ifarch ppc64
-Obsoletes:      libcdio-64bit
-%endif
-#
 
 %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.
 
-
 %package -n libudf0
 Summary:        CD-ROM Access Library
 Group:          Productivity/Multimedia/Other
-# bug437293
-%ifarch ppc64
-Obsoletes:      libcdio-64bit
-%endif
-#
 
 %description -n libudf0
 This library encapsulates CD-ROM reading and control. Applications
@@ -159,11 +123,8 @@ Requires:       libudf0 = %{version}
 Requires:       libcdio_cdda1 = %{version}
 Requires:       libcdio_paranoia1 = %{version}
 %endif
-# bug437293
+Requires(preun): %{install_info_prereq}
-%ifarch ppc64
+Requires(post): %{install_info_prereq}
-Obsoletes:      libcdio-devel-64bit
-%endif
-#
 
 %description devel
 This library encapsulates CD-ROM reading and control. Applications
@@ -172,6 +133,7 @@ CD-ROM can use this library.
 
 %prep
 %setup -q
+
 %define buildir ${PWD}
 
 %build
@@ -187,17 +149,17 @@ CD-ROM can use this library.
 	--without-cd-read \
 	--without-iso-info \
 	--without-iso-read
- VERBOSE=1 make -e %{?jobs:-j%jobs}
+ VERBOSE=1 make -e %{?_smp_mflags}
 #-lcdioutils
 
 %install
-%makeinstall
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 %if 1 == 0
-mv $RPM_BUILD_ROOT%{_mandir}/jp $RPM_BUILD_ROOT%{_mandir}/ja
+mv %{buildroot}%{_mandir}/jp %{buildroot}%{_mandir}/ja
 %endif
 #empty depdendency libs
 rm -rf %{buildroot}%{_bindir} %{buildroot}%{_mandir}
-rm -f %{buildroot}%{_libdir}/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
 
 %post -n libcdio%{cdio_soname} -p /sbin/ldconfig
 
@@ -218,7 +180,7 @@ rm -f %{buildroot}%{_libdir}/*.la
 %post devel
 %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
 
-%postun devel
+%preun devel
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
 
 %files -n libcdio%{cdio_soname}
@@ -240,7 +202,7 @@ rm -f %{buildroot}%{_libdir}/*.la
 
 %files devel
 %defattr (-, root, root)
-%doc %{_infodir}/*.info*
+%{_infodir}/*.info*
 %{_includedir}/cdio
 %{_includedir}/cdio++
 %{_libdir}/libcdio*.so
@@ -249,7 +211,6 @@ rm -f %{buildroot}%{_libdir}/*.la
 %{_libdir}/pkgconfig/*.pc
 
 %if %{build_paranoia} == 1
-
 %post -n libcdio_cdda1 -p /sbin/ldconfig
 
 %post -n libcdio_paranoia1 -p /sbin/ldconfig