From eb25b269a58b47a7f8e6bea8857c5f689078d7e378c1af663e7f1aff28b65593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 11 Jun 2018 11:01:53 +0000 Subject: [PATCH 1/3] Accepting request 615946 from home:kbabioch:branches:multimedia:libs - Update to version 2.0.0 - Fixed several memory leaks - Applied spec-cleaner - Update to 2.0.0 - Removed patches (included upstream): - CVE-2017-18201.patch - 0001-Savannah-Bug-49907.patch - Fixed heap-based buffer over-read in iso-info.c (CVE-2017-18198 bsc#1082819) - Fixed NULL pointer dereference in rock.c (CVE-2017-18199 bsc#1082821) - Fixed several (non-critical) memory leaks - Bumped sonames - Applied spec-cleaner OBS-URL: https://build.opensuse.org/request/show/615946 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libcdio?expand=0&rev=56 --- 0001-Savannah-Bug-49907.patch | 103 ---------------------------------- CVE-2017-18201.patch | 24 -------- baselibs.conf | 4 +- cdio-utils.changes | 7 +++ cdio-utils.spec | 9 +-- libcdio-0.94.tar.gz | 3 - libcdio-0.94.tar.gz.sig | 7 --- libcdio-2.0.0.tar.gz | 3 + libcdio-2.0.0.tar.gz.sig | 6 ++ libcdio.changes | 13 +++++ libcdio.spec | 40 ++++++------- 11 files changed, 52 insertions(+), 167 deletions(-) delete mode 100644 0001-Savannah-Bug-49907.patch delete mode 100644 CVE-2017-18201.patch delete mode 100644 libcdio-0.94.tar.gz delete mode 100644 libcdio-0.94.tar.gz.sig create mode 100644 libcdio-2.0.0.tar.gz create mode 100644 libcdio-2.0.0.tar.gz.sig diff --git a/0001-Savannah-Bug-49907.patch b/0001-Savannah-Bug-49907.patch deleted file mode 100644 index d194f46..0000000 --- a/0001-Savannah-Bug-49907.patch +++ /dev/null @@ -1,103 +0,0 @@ -From ddd984854b09c1a8203867534c087c0d83ff8622 Mon Sep 17 00:00:00 2001 -From: "R. Bernstein" -Date: Mon, 9 Oct 2017 12:35:54 -0400 -Subject: [PATCH] Savannah Bug #49907 - -subdir-objects breaks symbol versioning. See https://savannah.gnu.org/bugs/?49907 ---- - lib/driver/Makefile.am | 11 +++++------ - lib/iso9660/Makefile.am | 11 +++++------ - 2 files changed, 10 insertions(+), 12 deletions(-) - -Index: libcdio-0.94/lib/driver/Makefile.am -=================================================================== ---- libcdio-0.94.orig/lib/driver/Makefile.am -+++ libcdio-0.94/lib/driver/Makefile.am -@@ -176,13 +176,12 @@ if BUILD_VERSIONED_LIBS - libcdio_la_LDFLAGS = $(libcdio_la_ldflags) -Wl,--version-script=libcdio.la.ver - libcdio_la_DEPENDENCIES = libcdio.la.ver - --libcdio.la.ver: $(libcdio_la_OBJECTS) $(srcdir)/libcdio.sym -+libcdio.la.ver: $(srcdir)/libcdio.sym - @echo 'CDIO_$(libcdio_la_MAJOR) { ' > $@ -- @objs=`for obj in $(libcdio_la_OBJECTS); do sed -ne "s/^pic_object='\(.*\)'$$/\1/p" $$obj; done`; \ -- if test -n "$${objs}" ; then \ -- nm $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio.sym; then if test $$first = true; then echo " global:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \ -- nm $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio.sym; then :; else if test $$first = true; then echo " local:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \ -- fi -+ @echo ' global:' >> $@ -+ @sed 's/^/ /;s/$$/;/' $< >> $@ -+ @echo ' local:' >> $@ -+ @echo ' *;' >> $@ - @echo '};' >> $@ - else - libcdio_la_LDFLAGS = $(libcdio_la_ldflags) -Index: libcdio-0.94/lib/driver/Makefile.in -=================================================================== ---- libcdio-0.94.orig/lib/driver/Makefile.in -+++ libcdio-0.94/lib/driver/Makefile.in -@@ -981,13 +981,12 @@ uninstall-am: uninstall-libLTLIBRARIES - .PRECIOUS: Makefile - - --@BUILD_VERSIONED_LIBS_TRUE@libcdio.la.ver: $(libcdio_la_OBJECTS) $(srcdir)/libcdio.sym -+@BUILD_VERSIONED_LIBS_TRUE@libcdio.la.ver: $(srcdir)/libcdio.sym - @BUILD_VERSIONED_LIBS_TRUE@ @echo 'CDIO_$(libcdio_la_MAJOR) { ' > $@ --@BUILD_VERSIONED_LIBS_TRUE@ @objs=`for obj in $(libcdio_la_OBJECTS); do sed -ne "s/^pic_object='\(.*\)'$$/\1/p" $$obj; done`; \ --@BUILD_VERSIONED_LIBS_TRUE@ if test -n "$${objs}" ; then \ --@BUILD_VERSIONED_LIBS_TRUE@ nm $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio.sym; then if test $$first = true; then echo " global:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \ --@BUILD_VERSIONED_LIBS_TRUE@ nm $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio.sym; then :; else if test $$first = true; then echo " local:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \ --@BUILD_VERSIONED_LIBS_TRUE@ fi -+@BUILD_VERSIONED_LIBS_TRUE@ @echo ' global:' >> $@ -+@BUILD_VERSIONED_LIBS_TRUE@ @sed 's/^/ /;s/$$/;/' $< >> $@ -+@BUILD_VERSIONED_LIBS_TRUE@ @echo ' local:' >> $@ -+@BUILD_VERSIONED_LIBS_TRUE@ @echo ' *;' >> $@ - @BUILD_VERSIONED_LIBS_TRUE@ @echo '};' >> $@ - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -Index: libcdio-0.94/lib/iso9660/Makefile.am -=================================================================== ---- libcdio-0.94.orig/lib/iso9660/Makefile.am -+++ libcdio-0.94/lib/iso9660/Makefile.am -@@ -132,13 +132,12 @@ if BUILD_VERSIONED_LIBS - libiso9660_la_LDFLAGS = $(libiso9660_la_ldflags) -Wl,--version-script=libiso9660.la.ver - libiso9660_la_DEPENDENCIES = $(libcdio9660_la_dependencies) libiso9660.la.ver - --libiso9660.la.ver: $(libiso9660_la_OBJECTS) $(srcdir)/libiso9660.sym -+libiso9660.la.ver: $(srcdir)/libiso9660.sym - @echo 'ISO9660_$(libiso9660_la_MAJOR) {' > $@ -- @objs=`for obj in $(libiso9660_la_OBJECTS); do sed -ne "s/^pic_object='\(.*\)'$$/\1/p" $$obj; done`; \ -- if test -n "$$objs" ; then \ -- nm $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libiso9660.sym; then if test $$first = true; then echo " global:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \ -- nm $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libiso9660.sym; then :; else if test $$first = true; then echo " local:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \ -- fi -+ @echo ' global:' >> $@ -+ @sed 's/^/ /;s/$$/;/' $< >> $@ -+ @echo ' local:' >> $@ -+ @echo ' *;' >> $@ - @echo '};' >> $@ - - MOSTLYCLEANFILES = libiso9660.la.ver -Index: libcdio-0.94/lib/iso9660/Makefile.in -=================================================================== ---- libcdio-0.94.orig/lib/iso9660/Makefile.in -+++ libcdio-0.94/lib/iso9660/Makefile.in -@@ -824,13 +824,12 @@ uninstall-am: uninstall-libLTLIBRARIES - .PRECIOUS: Makefile - - --@BUILD_VERSIONED_LIBS_TRUE@libiso9660.la.ver: $(libiso9660_la_OBJECTS) $(srcdir)/libiso9660.sym -+@BUILD_VERSIONED_LIBS_TRUE@libiso9660.la.ver: $(srcdir)/libiso9660.sym - @BUILD_VERSIONED_LIBS_TRUE@ @echo 'ISO9660_$(libiso9660_la_MAJOR) {' > $@ --@BUILD_VERSIONED_LIBS_TRUE@ @objs=`for obj in $(libiso9660_la_OBJECTS); do sed -ne "s/^pic_object='\(.*\)'$$/\1/p" $$obj; done`; \ --@BUILD_VERSIONED_LIBS_TRUE@ if test -n "$$objs" ; then \ --@BUILD_VERSIONED_LIBS_TRUE@ nm $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libiso9660.sym; then if test $$first = true; then echo " global:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \ --@BUILD_VERSIONED_LIBS_TRUE@ nm $${objs} | sed -n -e 's/^.*[ ][ABCDGIRSTW][ABCDGIRSTW]*[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libiso9660.sym; then :; else if test $$first = true; then echo " local:"; first=false; fi; echo " $${symbol};"; fi; done; } >> $@; \ --@BUILD_VERSIONED_LIBS_TRUE@ fi -+@BUILD_VERSIONED_LIBS_TRUE@ @echo ' global:' >> $@ -+@BUILD_VERSIONED_LIBS_TRUE@ @sed 's/^/ /;s/$$/;/' $< >> $@ -+@BUILD_VERSIONED_LIBS_TRUE@ @echo ' local:' >> $@ -+@BUILD_VERSIONED_LIBS_TRUE@ @echo ' *;' >> $@ - @BUILD_VERSIONED_LIBS_TRUE@ @echo '};' >> $@ - - # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/CVE-2017-18201.patch b/CVE-2017-18201.patch deleted file mode 100644 index 265dd5b..0000000 --- a/CVE-2017-18201.patch +++ /dev/null @@ -1,24 +0,0 @@ -From f6f9c48fb40b8a1e8218799724b0b61a7161eb1d Mon Sep 17 00:00:00 2001 -From: "R. Bernstein" -Date: Fri, 22 Dec 2017 16:06:57 -0500 -Subject: [PATCH] Fix double free courtesy of Chris Clayton - ---- - lib/driver/_cdio_generic.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/lib/driver/_cdio_generic.c b/lib/driver/_cdio_generic.c -index d40ac0d9..ae820d25 100644 ---- a/lib/driver/_cdio_generic.c -+++ b/lib/driver/_cdio_generic.c -@@ -296,7 +296,6 @@ get_cdtext_generic (void *p_user_data) - - if(len <= 0 || 0 != cdtext_data_init (p_env->cdtext, &p_cdtext_data[4], len)) { - p_env->b_cdtext_error = true; -- cdtext_destroy (p_env->cdtext); - free(p_env->cdtext); - p_env->cdtext = NULL; - } --- -2.16.2 - diff --git a/baselibs.conf b/baselibs.conf index 2305a4f..34d3a2b 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,7 +1,7 @@ -libcdio16 +libcdio18 obsoletes "libcdio- <= " provides "libcdio- = " -libiso9660-10 +libiso9660-11 libcdio++0 libudf0 #libcdio_cdda1 diff --git a/cdio-utils.changes b/cdio-utils.changes index cad1b79..a83d74d 100644 --- a/cdio-utils.changes +++ b/cdio-utils.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 11 09:28:44 UTC 2018 - kbabioch@suse.com + +- Update to version 2.0.0 + - Fixed several memory leaks +- Applied spec-cleaner + ------------------------------------------------------------------- Tue Sep 5 12:02:14 UTC 2017 - jengelh@inai.de diff --git a/cdio-utils.spec b/cdio-utils.spec index 3abe671..c73f470 100644 --- a/cdio-utils.spec +++ b/cdio-utils.spec @@ -18,12 +18,12 @@ %define cdioutils 1 Name: cdio-utils -Version: 0.94 +Version: 2.0.0 Release: 0 Summary: Utility programs making use of libcdio, a CD-ROM access library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Multimedia/Other -Url: https://savannah.gnu.org/projects/libcdio +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 @@ -74,7 +74,8 @@ rm -rf %{buildroot}%{_libdir} %{buildroot}%{_includedir} %{buildroot}%{_infodir} %fdupes -s %{buildroot}%{_mandir} %files -n cdio-utils -%doc AUTHORS COPYING NEWS README README.libcdio THANKS TODO +%doc AUTHORS NEWS README README.libcdio THANKS TODO +%license COPYING* %{_bindir}/cd-* %{_bindir}/cdda-* %{_bindir}/iso-* diff --git a/libcdio-0.94.tar.gz b/libcdio-0.94.tar.gz deleted file mode 100644 index 1a5bd30..0000000 --- a/libcdio-0.94.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:96e2c903f866ae96f9f5b9048fa32db0921464a2286f5b586c0f02699710025a -size 2355452 diff --git a/libcdio-0.94.tar.gz.sig b/libcdio-0.94.tar.gz.sig deleted file mode 100644 index 466bc70..0000000 --- a/libcdio-0.94.tar.gz.sig +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iEYEABECAAYFAlgMKrQACgkQGo3lAIJ17CHSTgCgjV97eveGqKzb03fgIILvRTM+ -TL4AniC1eKTg/bIPIek0rrl4kC/hNiVk -=vwnY ------END PGP SIGNATURE----- diff --git a/libcdio-2.0.0.tar.gz b/libcdio-2.0.0.tar.gz new file mode 100644 index 0000000..e59b238 --- /dev/null +++ b/libcdio-2.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b481b5da009bea31db875805665974e2fc568e2b2afa516f4036733657cf958 +size 2354813 diff --git a/libcdio-2.0.0.tar.gz.sig b/libcdio-2.0.0.tar.gz.sig new file mode 100644 index 0000000..e0fc1b7 --- /dev/null +++ b/libcdio-2.0.0.tar.gz.sig @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iEYEABECAAYFAlpJdAsACgkQGo3lAIJ17CEXdgCdEZXiRK7QgIz2cT0J7ck9URTK +xh8AnjmWzo2mrHFaROhv+upvO/XKv8gg +=gzNu +-----END PGP SIGNATURE----- diff --git a/libcdio.changes b/libcdio.changes index 45f940d..710e164 100644 --- a/libcdio.changes +++ b/libcdio.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Jun 11 09:31:42 UTC 2018 - kbabioch@suse.com + +- Update to 2.0.0 + - Removed patches (included upstream): + - CVE-2017-18201.patch + - 0001-Savannah-Bug-49907.patch + - Fixed heap-based buffer over-read in iso-info.c (CVE-2017-18198 bsc#1082819) + - Fixed NULL pointer dereference in rock.c (CVE-2017-18199 bsc#1082821) + - Fixed several (non-critical) memory leaks + - Bumped sonames +- Applied spec-cleaner + ------------------------------------------------------------------- Tue Feb 27 17:09:35 CET 2018 - sbrabec@suse.com diff --git a/libcdio.spec b/libcdio.spec index 7f9e1f7..df6f87e 100644 --- a/libcdio.spec +++ b/libcdio.spec @@ -16,36 +16,30 @@ # -%define cdioutils 0 -%define cdio_soname 16 +%define cdio_soname 18 +%define libiso9660_soname 11 Name: libcdio -Version: 0.94 +Version: 2.0.0 Release: 0 Summary: CD-ROM Access Library -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Multimedia/Other -Url: https://savannah.gnu.org/projects/libcdio +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 -# PATCH-FIX-UPSTREAM 0001-Savannah-Bug-49907.patch https://savannah.gnu.org/bugs/index.php?49907 -Patch0: 0001-Savannah-Bug-49907.patch -# PATCH-FIX-SECURITY CVE-2017-18201.patch bsc1082877 CVE-2017-18201 sbrabec@suse.com -- Fix double free vulnerability. -Patch1: CVE-2017-18201.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: help2man BuildRequires: libtool +BuildRequires: makeinfo BuildRequires: ncurses-devel BuildRequires: pkgconfig BuildRequires: popt-devel BuildRequires: pkgconfig(libcddb) Requires(post): %{install_info_prereq} Requires(preun): %{install_info_prereq} -%if 0%{?suse_version} > 1220 -BuildRequires: makeinfo -%endif %description The libcdio package contains libraries for CD-ROM and CD image @@ -75,19 +69,20 @@ access. This subpackage contains the C++ API library for cdio. -%package -n libiso9660-10 +%package -n libiso9660-%{libiso9660_soname} Summary: Library for working with ISO 9660 filesystems Group: System/Libraries -%description -n libiso9660-10 -A library for working with ISO 9660 filesystems. +%description -n libiso9660-%{libiso9660_soname} +A library for working with ISO 9660 filesystems, which are mainly used on CDs. %package -n libudf0 Summary: Library for working with Universal Disk Format filesystems Group: System/Libraries %description -n libudf0 -A library for working with UDF filesystems. +This library is made to read and write UDF filesystems, which are mainly +used on DVDs. %package devel Summary: CD-ROM access library @@ -95,7 +90,7 @@ Group: Development/Languages/C and C++ Requires: glibc-devel Requires: libcdio%{cdio_soname} = %{version} Requires: libcdio++0 = %{version} -Requires: libiso9660-10 = %{version} +Requires: libiso9660-%{libiso9660_soname} = %{version} Requires: libudf0 = %{version} Requires(post): %{install_info_prereq} Requires(preun): %{install_info_prereq} @@ -111,8 +106,6 @@ applications that want to make use of the cdio libraries. %prep %setup -q -%patch0 -p1 -%patch1 -p1 %define buildir ${PWD} @@ -128,7 +121,6 @@ applications that want to make use of the cdio libraries. --without-iso-info \ --without-iso-read VERBOSE=1 make -e %{?_smp_mflags} -#-lcdioutils %install %make_install @@ -141,11 +133,11 @@ find %{buildroot} -type f -name "*.la" -delete -print %post -n libcdio%{cdio_soname} -p /sbin/ldconfig %post -n libcdio++0 -p /sbin/ldconfig -%post -n libiso9660-10 -p /sbin/ldconfig +%post -n libiso9660-%{libiso9660_soname} -p /sbin/ldconfig %post -n libudf0 -p /sbin/ldconfig %postun -n libcdio%{cdio_soname} -p /sbin/ldconfig %postun -n libcdio++0 -p /sbin/ldconfig -%postun -n libiso9660-10 -p /sbin/ldconfig +%postun -n libiso9660-%{libiso9660_soname} -p /sbin/ldconfig %postun -n libudf0 -p /sbin/ldconfig %post devel %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz @@ -160,14 +152,14 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_libdir}/libcdio++.so.* %{_libdir}/libiso9660++.so.* -%files -n libiso9660-10 +%files -n libiso9660-%{libiso9660_soname} %{_libdir}/libiso9660.so.* %files -n libudf0 %{_libdir}/libudf.so.* %files devel -%{_infodir}/*.info* +%{_infodir}/*.info%{?ext_info} %{_includedir}/cdio %{_includedir}/cdio++ %{_libdir}/libcdio*.so From 74ebfa67db1e1870b73efb20ca8e48e1c4531ab1d6faddcaec9691c652ee29c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 11 Jun 2018 12:57:21 +0000 Subject: [PATCH 2/3] - Sort out a bit to properly define all the library names as defines for easier updating in future when soname changes - Execute testsuite OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libcdio?expand=0&rev=57 --- libcdio.changes | 7 +++++ libcdio.spec | 70 ++++++++++++++++++++++++------------------------- 2 files changed, 42 insertions(+), 35 deletions(-) diff --git a/libcdio.changes b/libcdio.changes index 710e164..d7031a3 100644 --- a/libcdio.changes +++ b/libcdio.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 11 12:50:34 UTC 2018 - tchvatal@suse.com + +- Sort out a bit to properly define all the library names as defines + for easier updating in future when soname changes +- Execute testsuite + ------------------------------------------------------------------- Mon Jun 11 09:31:42 UTC 2018 - kbabioch@suse.com diff --git a/libcdio.spec b/libcdio.spec index df6f87e..bc08dcf 100644 --- a/libcdio.spec +++ b/libcdio.spec @@ -16,8 +16,10 @@ # -%define cdio_soname 18 -%define libiso9660_soname 11 +%define cdio_name libcdio18 +%define cdiopp_name libcdio++0 +%define iso9660_name libiso9660-11 +%define udf_name libudf0 Name: libcdio Version: 2.0.0 Release: 0 @@ -47,11 +49,11 @@ 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} +%package -n %{cdio_name} Summary: CD-ROM Access Library Group: System/Libraries -%description -n libcdio%{cdio_soname} +%description -n %{cdio_name} 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 @@ -59,39 +61,38 @@ various CD image formats. This subpackage contains the C API library from cdio. -%package -n libcdio++0 +%package -n %{cdiopp_name} Summary: C++ API for the libcdio CD-ROM access library Group: System/Libraries -%description -n libcdio++0 +%description -n %{cdiopp_name} The libcdio package contains libraries for CD-ROM and CD image access. This subpackage contains the C++ API library for cdio. -%package -n libiso9660-%{libiso9660_soname} +%package -n %{iso9660_name} Summary: Library for working with ISO 9660 filesystems Group: System/Libraries -%description -n libiso9660-%{libiso9660_soname} +%description -n %{iso9660_name} A library for working with ISO 9660 filesystems, which are mainly used on CDs. -%package -n libudf0 +%package -n %{udf_name} Summary: Library for working with Universal Disk Format filesystems Group: System/Libraries -%description -n libudf0 +%description -n %{udf_name} This library is made to read and write UDF filesystems, which are mainly used on DVDs. %package devel Summary: CD-ROM access library Group: Development/Languages/C and C++ -Requires: glibc-devel -Requires: libcdio%{cdio_soname} = %{version} -Requires: libcdio++0 = %{version} -Requires: libiso9660-%{libiso9660_soname} = %{version} -Requires: libudf0 = %{version} +Requires: %{cdio_name} = %{version} +Requires: %{cdiopp_name} = %{version} +Requires: %{iso9660_name} = %{version} +Requires: %{udf_name} = %{version} Requires(post): %{install_info_prereq} Requires(preun): %{install_info_prereq} @@ -107,8 +108,6 @@ applications that want to make use of the cdio libraries. %prep %setup -q -%define buildir ${PWD} - %build %configure \ --disable-rpath \ @@ -120,42 +119,43 @@ applications that want to make use of the cdio libraries. --without-cd-read \ --without-iso-info \ --without-iso-read - VERBOSE=1 make -e %{?_smp_mflags} +make %{?_smp_mflags} %install %make_install -%if 1 == 0 -mv %{buildroot}%{_mandir}/jp %{buildroot}%{_mandir}/ja -%endif #empty depdendency libs rm -rf %{buildroot}%{_bindir} %{buildroot}%{_mandir} find %{buildroot} -type f -name "*.la" -delete -print -%post -n libcdio%{cdio_soname} -p /sbin/ldconfig -%post -n libcdio++0 -p /sbin/ldconfig -%post -n libiso9660-%{libiso9660_soname} -p /sbin/ldconfig -%post -n libudf0 -p /sbin/ldconfig -%postun -n libcdio%{cdio_soname} -p /sbin/ldconfig -%postun -n libcdio++0 -p /sbin/ldconfig -%postun -n libiso9660-%{libiso9660_soname} -p /sbin/ldconfig -%postun -n libudf0 -p /sbin/ldconfig +%check +make %{?_smp_mflags} check + +%post -n %{cdio_name} -p /sbin/ldconfig +%post -n %{cdiopp_name} -p /sbin/ldconfig +%post -n %{iso9660_name} -p /sbin/ldconfig +%post -n %{udf_name} -p /sbin/ldconfig +%postun -n %{cdio_name} -p /sbin/ldconfig +%postun -n %{cdiopp_name} -p /sbin/ldconfig +%postun -n %{iso9660_name} -p /sbin/ldconfig +%postun -n %{udf_name} -p /sbin/ldconfig + %post devel -%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{?ext_info} %preun devel -%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{?ext_info} -%files -n libcdio%{cdio_soname} +%files -n %{cdio_name} %{_libdir}/libcdio.so.* -%files -n libcdio++0 +%files -n %{cdiopp_name} %{_libdir}/libcdio++.so.* %{_libdir}/libiso9660++.so.* -%files -n libiso9660-%{libiso9660_soname} +%files -n %{iso9660_name} %{_libdir}/libiso9660.so.* -%files -n libudf0 +%files -n %{udf_name} %{_libdir}/libudf.so.* %files devel From e4bcb41bc2ce9af1a5bb0d9cc0bf677636371bf9edb04c350c0ce3007150236b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 11 Jun 2018 13:24:58 +0000 Subject: [PATCH 3/3] - Applied spec-cleaner - Require newer vcdimager OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libcdio?expand=0&rev=58 --- cdio-utils.changes | 3 ++- cdio-utils.spec | 5 +++-- libcdio.spec | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cdio-utils.changes b/cdio-utils.changes index a83d74d..d436bba 100644 --- a/cdio-utils.changes +++ b/cdio-utils.changes @@ -3,7 +3,8 @@ Mon Jun 11 09:28:44 UTC 2018 - kbabioch@suse.com - Update to version 2.0.0 - Fixed several memory leaks -- Applied spec-cleaner +- Applied spec-cleaner +- Require newer vcdimager ------------------------------------------------------------------- Tue Sep 5 12:02:14 UTC 2017 - jengelh@inai.de diff --git a/cdio-utils.spec b/cdio-utils.spec index c73f470..6abad03 100644 --- a/cdio-utils.spec +++ b/cdio-utils.spec @@ -38,7 +38,7 @@ BuildRequires: ncurses-devel BuildRequires: pkgconfig BuildRequires: popt-devel BuildRequires: pkgconfig(libcddb) -BuildRequires: pkgconfig(libvcdinfo) +BuildRequires: pkgconfig(libvcdinfo) >= 2.0 Provides: libcdio-utils = %{version} Obsoletes: libcdio-utils < %{version} @@ -58,6 +58,7 @@ export VCDINFO_LIBS="-L%{_libdir} -lvcdinfo -L%{buildir}/lib/iso9660/.libs/ -lis VCDINFO_CFLAGS=-I%{_includedir}/libvcd VCDINFO_LIBS="-L%{_libdir} -lvcdinfo -L%{buildir}/lib/iso9660/.libs -liso9660 \ -L%{buildir}/lib/driver/.libs -lcdio" \ %configure \ + --disable-silent-rules \ --disable-rpath \ --disable-static \ --disable-cxx \ @@ -65,7 +66,7 @@ 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 %{?_smp_mflags} +make %{?_smp_mflags} %install %make_install diff --git a/libcdio.spec b/libcdio.spec index bc08dcf..7cb7bf9 100644 --- a/libcdio.spec +++ b/libcdio.spec @@ -110,6 +110,7 @@ applications that want to make use of the cdio libraries. %build %configure \ + --disable-silent-rules \ --disable-rpath \ --disable-static \ --enable-rock \