diff --git a/gpgkey-44BC9FD0D688EB007C4DD029E9CBDFC0ABC0A854.gpg b/gpgkey-44BC9FD0D688EB007C4DD029E9CBDFC0ABC0A854.gpg new file mode 100644 index 0000000000000000000000000000000000000000..00da334c9844a46eaef40d8353bbf8f96be73f5d Binary files /dev/null and b/gpgkey-44BC9FD0D688EB007C4DD029E9CBDFC0ABC0A854.gpg differ diff --git a/libburn-1.4.8.tar.gz b/libburn-1.4.8.tar.gz deleted file mode 100644 index 1a043f2db4e3520c590edeeb3551ae506b2d5f49..0000000000000000000000000000000000000000 Binary files a/libburn-1.4.8.tar.gz and /dev/null differ diff --git a/libburn-1.4.8.tar.gz.sig b/libburn-1.4.8.tar.gz.sig deleted file mode 100644 index 823f358befc09894172ff7d6c549e5821b4ab5c9..0000000000000000000000000000000000000000 Binary files a/libburn-1.4.8.tar.gz.sig and /dev/null differ diff --git a/libburn-1.5.4.tar.gz b/libburn-1.5.4.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..c14264942dfe137fb54052f3c5bb52d71a14f43c Binary files /dev/null and b/libburn-1.5.4.tar.gz differ diff --git a/libburn-1.5.4.tar.gz.sig b/libburn-1.5.4.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000..84a2176f731f417145de971d430a4bc58fa4a1e8 Binary files /dev/null and b/libburn-1.5.4.tar.gz.sig differ diff --git a/libburn.spec b/libburn.spec index c4563471407641e838db7e9594427a2aa2cdad49..e4a3facd50aa98683b0e3e6f1c016234ce38ff54 100644 --- a/libburn.spec +++ b/libburn.spec @@ -1,26 +1,22 @@ %global pkgname libburn -%if 0%{?rhel} >= 6 && 0%{?rhel} <= 7 -%global cdrskin cdrskin1 -%else -%global cdrskin cdrskin -%endif - Summary: Library for reading, mastering and writing optical discs Name: libburn -Version: 1.4.8 -Release: 3%{?dist} +Version: 1.5.4 +Release: 4%{?dist} License: GPLv2+ -Group: System Environment/Libraries -URL: http://libburnia-project.org/ -Source0: http://files.libburnia-project.org/releases/%{pkgname}-%{version}.tar.gz -Source1: http://files.libburnia-project.org/releases/%{pkgname}-%{version}.tar.gz.sig +URL: https://libburnia-project.org/ +Source0: https://files.libburnia-project.org/releases/%{pkgname}-%{version}.tar.gz +Source1: https://files.libburnia-project.org/releases/%{pkgname}-%{version}.tar.gz.sig +Source2: gpgkey-44BC9FD0D688EB007C4DD029E9CBDFC0ABC0A854.gpg Patch0: libburn-0.6.16-multilib.patch -BuildRequires: intltool, gettext -%if 0%{?rhel} >= 6 && 0%{?rhel} <= 7 +BuildRequires: gnupg2 +BuildRequires: gcc, make, intltool, gettext +BuildRequires: chrpath +%if 0%{?rhel} && "%{name}" != "%{pkgname}" BuildRequires: autoconf, automake, libtool, pkgconfig +%global variant 1 %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Libburn is a library by which preformatted data get onto optical media: @@ -34,45 +30,43 @@ need such a reload. The code of libburn is independent of cdrecord. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release}, pkgconfig %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +%if 0%{!?_without_doc:1} %package doc Summary: Documentation files for %{name} -Group: Documentation -%if 0%{?fedora} || 0%{?rhel} >= 6 BuildArch: noarch -%endif BuildRequires: doxygen, graphviz %description doc Libburn is a library by which preformatted data get onto optical media: CD, DVD and BD (Blu-Ray). This package contains the API documentation for developing applications that use %{name}. +%endif -%package -n %{cdrskin} +%package -n cdrskin%{?variant} Summary: Limited cdrecord compatibility wrapper to ease migration to %{name} -Group: Applications/Multimedia Requires: %{name}%{?_isa} = %{version}-%{release} -%if 0%{?rhel} >= 6 || 0%{?fedora} Requires(post): %{_sbindir}/alternatives, coreutils Requires(preun): %{_sbindir}/alternatives -%endif +Provides: cdrecord +Provides: wodim -%description -n %{cdrskin} +%description -n cdrskin%{?variant} A limited cdrecord compatibility wrapper which allows to use some %{name} features from the command line. %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %setup -q -n %{pkgname}-%{version} %patch0 -p1 -b .multilib -# Rename from libburn to libburn1 for RHEL >= 6 -%if 0%{?rhel} >= 6 && 0%{?rhel} <= 7 +# Rename from libburn to libburn1 for EPEL +%if 0%{?rhel} && "%{name}" != "%{pkgname}" sed -e 's@libburn_libburn@libburn_libburn1@g' \ -e 's@libburn/libburn.la@libburn/libburn1.la@g' \ -e 's@(includedir)/libburn@(includedir)/libburn1@g' \ @@ -81,17 +75,16 @@ sed -e 's@libburn-1.pc@libburn1-1.pc@g' -i configure.ac sed -e 's@burn@burn1@g' libburn-1.pc.in > libburn1-1.pc.in libtoolize --force -autoreconf --force +autoreconf --force --install %endif %build %configure --disable-static -make %{?_smp_mflags} -doxygen doc/doxygen.conf +%make_build +%{!?_without_doc:doxygen doc/doxygen.conf} %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install +%make_install # Don't install any libtool .la files rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.la @@ -99,42 +92,32 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.la # Clean up for later usage in documentation rm -rf $RPM_BUILD_ROOT%{_defaultdocdir} -# RHEL >= 6 ships a cdrskin package already -%if 0%{?rhel} >= 6 && 0%{?rhel} <= 7 -mv -f $RPM_BUILD_ROOT%{_bindir}/{cdrskin,%{cdrskin}} -mv -f $RPM_BUILD_ROOT%{_mandir}/man1/{cdrskin,%{cdrskin}}.1 -%endif +chrpath -d $RPM_BUILD_ROOT%{_bindir}/cdrskin -# Symlink cdrskin as cdrecord (like in cdrkit) -%if 0%{?rhel} >= 6 || 0%{?fedora} -ln -sf %{cdrskin} $RPM_BUILD_ROOT%{_bindir}/cdrecord +# RHEL ships a cdrskin package already +%if 0%{?rhel} && "%{name}" != "%{pkgname}" +mv -f $RPM_BUILD_ROOT%{_bindir}/cdrskin{,%{?variant}} +mv -f $RPM_BUILD_ROOT%{_mandir}/man1/cdrskin{,%{?variant}}.1 %endif -%clean -rm -rf $RPM_BUILD_ROOT +# Prepare alternatives handling for cdrecord, wodim -> cdrskin +touch $RPM_BUILD_ROOT{%{_bindir}/cdrecord,%{_mandir}/man1/cdrecord.1.gz} +touch $RPM_BUILD_ROOT{%{_bindir}/wodim,%{_mandir}/man1/wodim.1.gz} -%post -p /sbin/ldconfig +%ldconfig_scriptlets -%postun -p /sbin/ldconfig +%post -n cdrskin%{?variant} +%{_sbindir}/alternatives --install %{_bindir}/cdrecord cdrecord %{_bindir}/cdrskin%{?variant} 60 \ + --slave %{_mandir}/man1/cdrecord.1.gz cdrecord-cdrecordman %{_mandir}/man1/cdrskin%{?variant}.1.gz \ + --slave %{_bindir}/wodim cdrecord-wodim %{_bindir}/cdrskin%{?variant} \ + --slave %{_mandir}/man1/wodim.1.gz cdrecord-wodimman %{_mandir}/man1/cdrskin%{?variant}.1.gz -%if 0%{?rhel} >= 6 || 0%{?fedora} -%post -n %{cdrskin} -link=`readlink %{_bindir}/cdrecord` -if [ "$link" == "%{cdrskin}" ]; then - rm -f %{_bindir}/cdrecord +%preun -n cdrskin%{?variant} +if [ $1 -eq 0 ]; then + %{_sbindir}/alternatives --remove cdrecord %{_bindir}/cdrskin%{?variant} 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 -%{!?_licensedir:%global license %%doc} %license COPYING %doc AUTHORS COPYRIGHT README %{_libdir}/%{name}*.so.* @@ -144,17 +127,61 @@ fi %{_libdir}/%{name}*.so %{_libdir}/pkgconfig/%{name}*.pc +%if 0%{!?_without_doc:1} %files doc %doc doc/html/ +%endif -%files -n %{cdrskin} -%if 0%{?rhel} >= 6 || 0%{?fedora} +%files -n cdrskin%{?variant} %ghost %{_bindir}/cdrecord -%endif -%{_bindir}/%{cdrskin} -%{_mandir}/man1/%{cdrskin}.1* +%ghost %{_bindir}/wodim +%{_bindir}/cdrskin%{?variant} +%ghost %{_mandir}/man1/cdrecord.1* +%ghost %{_mandir}/man1/wodim.1* +%{_mandir}/man1/cdrskin%{?variant}.1* %changelog +* Tue Feb 08 2022 Jiri Kucera - 1.5.4-4 +- Fix cdrecord & wodim alternatives + Related: #2015861 + +* Mon Aug 09 2021 Mohan Boddu - 1.5.4-3 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Fri Apr 16 2021 Mohan Boddu - 1.5.4-2 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Mon Feb 08 2021 Robert Scheck 1.5.4-1 +- Upgrade to 1.5.4 (#1926008) + +* Tue Jan 26 2021 Fedora Release Engineering - 1.5.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Dec 28 2020 Robert Scheck 1.5.2-4 +- Upgrade to 1.5.2.pl01 (#1776514) + +* Tue Jul 28 2020 Fedora Release Engineering - 1.5.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 1.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sun Oct 27 2019 Robert Scheck 1.5.2-1 +- Upgrade to 1.5.2 (#1765953) + +* Thu Jul 25 2019 Fedora Release Engineering - 1.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 1.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Dec 08 2018 Robert Scheck 1.5.0-1 +- Upgrade to 1.5.0 + +* Fri Jul 13 2018 Fedora Release Engineering - 1.4.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1.4.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild