Compare commits

..

No commits in common. "c8s" and "c9s" have entirely different histories.
c8s ... c9s

4 changed files with 102 additions and 73 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/gpgkey-*.gpg
/libburn-*.tar.gz /libburn-*.tar.gz
/libburn-*.tar.gz.sig /libburn-*.tar.gz.sig

View File

@ -1,6 +1,6 @@
--- !Policy --- !Policy
product_versions: product_versions:
- rhel-8 - rhel-9
decision_context: osci_compose_gate decision_context: osci_compose_gate
rules: rules:
- !PassingTestCaseRule {test_case_name: manual.sst_desktop.libburn.sanity} - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

View File

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

View File

@ -1,2 +1,3 @@
SHA512 (libburn-1.4.8.tar.gz) = e02c08078313abb19108bb394741d4bde1c5098c1a200129940744e03078d8350b6ac951bf5523872a343b3f9b7a4954dda60a3336997f975abdee6dbae9b87c SHA512 (gpgkey-44BC9FD0D688EB007C4DD029E9CBDFC0ABC0A854.gpg) = d287374e95680ca4be38d7dc09c71e9f2e466eb62abc6fc29da6d5d984e0bceab9a2d0eca85ccb3a6f2cd7cbaa6c8d02c817aa84864d159616b0b2ca8e96b9db
SHA512 (libburn-1.4.8.tar.gz.sig) = c456bcfac8bc6bb20c0a9b79f50ed56d5f01a63db328a1aa68fbacfba706977391405887f014ba76db965fdaddcbfa5196e0f85b5056a04c4b7daaec33831d59 SHA512 (libburn-1.5.4.tar.gz) = dd7b14093e62e2c02011955c24e01d70ed78969b14faf7e5a63c0da97a80c438b628922532eb135af7dea8ee7c7b83554b3354160306dad852ce5bf6eb1d5ac9
SHA512 (libburn-1.5.4.tar.gz.sig) = 24d5846030c11072fafdfc697d5dd4faeae37c08a4010841c3eec21f114a6d8f9f8d5a5d4cc66fac21469813a2cceb3ef8366cf3f01f183e46a1e46e838b2c60