From 659a54494d75869bd056461af8180e693ee17d24 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Fri, 25 Dec 2015 00:27:06 +0100 Subject: [PATCH] - Update to upstream 1.4.2 (#1287345) - Add symlink handling via alternatives for cdrecord (#1256240) --- libburn.spec | 78 ++++++++++++++++++++++++++++++++++++---------------- sources | 2 +- 2 files changed, 56 insertions(+), 24 deletions(-) diff --git a/libburn.spec b/libburn.spec index 309a40d..7eddc76 100644 --- a/libburn.spec +++ b/libburn.spec @@ -1,15 +1,14 @@ -Summary: Library for reading, mastering and writing optical discs -Name: libburn -Version: 1.4.0 -Release: 2%{?dist} -License: GPLv2+ -Group: System Environment/Libraries -URL: http://libburnia-project.org/ -Source0: http://files.libburnia-project.org/releases/%{name}-%{version}.tar.gz -Patch0: libburn-0.6.16-multilib.patch -BuildRequires: intltool, gettext, doxygen, graphviz -BuildRequires: autoconf, automake, libtool, pkgconfig -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Summary: Library for reading, mastering and writing optical discs +Name: libburn +Version: 1.4.2 +Release: 1%{?dist} +License: GPLv2+ +Group: System Environment/Libraries +URL: http://libburnia-project.org/ +Source0: http://files.libburnia-project.org/releases/%{name}-%{version}.tar.gz +Patch0: libburn-0.6.16-multilib.patch +BuildRequires: intltool, gettext, doxygen, graphviz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Libburn is a library by which preformatted data get onto optical media: @@ -21,19 +20,23 @@ the block device driver needs reloading of the drive tray in order to make available freshly written data. The libburn read function does not need such a reload. The code of libburn is independent of cdrecord. -%package devel -Summary: Development files for libburn -Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release}, pkgconfig +%package devel +Summary: Development files for libburn +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release}, pkgconfig %description devel The libburn-devel package contains libraries and header files for developing applications that use libburn. -%package -n cdrskin -Summary: Limited cdrecord compatibility wrapper to ease migration to libburn -Group: Applications/Multimedia -Requires: %{name}%{?_isa} = %{version}-%{release} +%package -n cdrskin +Summary: Limited cdrecord compatibility wrapper to ease migration to libburn +Group: Applications/Multimedia +Requires: %{name}%{?_isa} = %{version}-%{release} +%if 0%{?rhel} > 5 || 0%{?fedora} +Requires(post): %{_sbindir}/alternatives, coreutils +Requires(preun): %{_sbindir}/alternatives +%endif %description -n cdrskin A limited cdrecord compatibility wrapper which allows to use some libburn @@ -42,7 +45,6 @@ features from the command line. %prep %setup -q %patch0 -p1 -b .multilib -autoreconf --force --install %build %configure --disable-static @@ -56,6 +58,11 @@ make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install # Don't install any libtool .la files rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.la +# Symlink cdrskin as cdrecord (like in cdrkit) +%if 0%{?rhel} > 5 || 0%{?fedora} +ln -sf cdrskin $RPM_BUILD_ROOT%{_bindir}/cdrecord +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -63,9 +70,27 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig +%if 0%{?rhel} > 5 || 0%{?fedora} +%post -n cdrskin +link=`readlink %{_bindir}/cdrecord` +if [ "$link" == "cdrskin" ]; then + rm -f %{_bindir}/cdrecord +fi + +%{_sbindir}/alternatives --install %{_bindir}/cdrecord cdrecord %{_bindir}/cdrskin 50 \ + --slave %{_mandir}/man1/cdrecord.1.gz cdrecord-cdrecordman %{_mandir}/man1/cdrskin.1.gz + +%preun -n cdrskin +if [ $1 = 0 ]; then + %{_sbindir}/alternatives --remove cdrecord %{_bindir}/cdrskin +fi +%endif + %files %defattr(-,root,root,-) -%doc AUTHORS COPYING COPYRIGHT README +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc AUTHORS COPYRIGHT README %{_libdir}/%{name}*.so.* %files devel @@ -77,10 +102,17 @@ rm -rf $RPM_BUILD_ROOT %files -n cdrskin %defattr(-,root,root,-) -%{_mandir}/*/* +%if 0%{?rhel} > 5 || 0%{?fedora} +%ghost %{_bindir}/cdrecord +%endif %{_bindir}/cdrskin +%{_mandir}/man1/cdrskin.1* %changelog +* Thu Dec 24 2015 Robert Scheck 1.4.2-1 +- Update to upstream 1.4.2 (#1287345) +- Add symlink handling via alternatives for cdrecord (#1256240) + * Wed Jun 17 2015 Fedora Release Engineering - 1.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 3adc079..1d6c1f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -82ff94bb04e78eac9b12c7546f005d6f libburn-1.4.0.tar.gz +cb1cc7c096bd9a2e059fe1fec994c5b4 libburn-1.4.2.tar.gz