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