Compare commits

..

No commits in common. 'c9' and 'cs10' have entirely different histories.
c9 ... cs10

4
.gitignore vendored

@ -1,2 +1,2 @@
SOURCES/gpgkey-44BC9FD0D688EB007C4DD029E9CBDFC0ABC0A854.gpg SOURCES/libburn-1.5.6.tar.gz
SOURCES/libburn-1.5.4.tar.gz SOURCES/libburn-1.5.6.tar.gz.sig

@ -1,2 +1,2 @@
896ddcb0c8d6e8b60a82642331350d7fde7ab737 SOURCES/gpgkey-44BC9FD0D688EB007C4DD029E9CBDFC0ABC0A854.gpg e2e3e17f86d2f8189dc4b2d0fed5649032950594 SOURCES/libburn-1.5.6.tar.gz
f1f6b91c18bcf0df1c38a0665657b10f1a76de58 SOURCES/libburn-1.5.4.tar.gz 4c14429cc1a83f5664fddb518cddbb1dbab38ea9 SOURCES/libburn-1.5.6.tar.gz.sig

@ -0,0 +1,31 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Comment: 44BC 9FD0 D688 EB00 7C4D D029 E9CB DFC0 ABC0 A854
xsDiBEuxz8kRBADMPu5I4LHXlih4Rd66cbPO1hkRir22yGbBkDVL1GAYy+T0RWzo
ILLdZm2n/Lgqhf+tBEWVft1Y2pkGRgG81cOItR+LDXVVWcR6KQudMBI7qeBrijBF
a09c9MJ2cJ2b/vkyxeqeOO012OKQ0jPc4l5OtKr+WwzOBaYBE5Q3+OkJkwCgwDy7
f79ruLDT1MkNixjPIyQpdmkD+waqPewvQ6VMwXeX30gHmileCNXuz5U1NVsuvJH4
5LtDokl9v/A/lD3Y6DEYD10Ye0hV0YLd140cfhRqvqt/JjfpzePYSUrwH7yW49T4
C8J4JgTNuF3KFop8Bq6XNiDbEXxSfjiXWJu51pLRSe4r7ux8AwsgopFdAU28Ccml
1puGA/4xWZrsauu0pVKK3Ox1/PPdyFqUXUV3Vm2yqc7+5stozI2cCrUXzZum+ju1
5WL4QqFvt354j2PBa4dSMOiqGSqDtn7Q+jI3dNp6KaN/3NFz87rLOBOS/F22tMiF
q4CX2vhy3b6AHe2SKMEMJBF3RIHLivuTZGqqctA8K5gYs6HDlM0iVGhvbWFzIFNj
aG1pdHQgPHNjZGJhY2t1cEBnbXgubmV0PsJ3BBMRAgAgBQJLsc/JAhsDBgsJCAcD
AgQVAggDBBYCAwECHgECF4AAIQkQ6cvfwKvAqFQWIQREvJ/Q1ojrAHxN0Cnpy9/A
q8CoVMnjAJ0XUrdWn95haLAm09NsVxQBFuH3tACfV44Wx4rQLPNzMKWoYcjJiLq0
3bPOwU0ES7HP0BAIAPJyFbTIM7iYmFI/tqz9+K05dbA0gAJTkHwR3FyJTll8Mar/
O+fOkOjDhTO8KxelWfjlGNEPtxQyolThok6rV778cthX8oQV333oWmGARfukh7sD
M/FhepJQ11jPCiHG9J+y6vXYphnbzWVLGgPR7oE106ugIeSJVBFYUT5mgnM1/uR5
VbqEbEWfX9uN5eC/oS3NFyuYgtfbTRZp6HPBEQ5qFM0pTsk2Ld/m4tZK032VN28u
o9kdWfDgnWTVoSVXE6LtmM5gEd4cvv3GB2rx8KA9FGnlEIfpQzIVc2gvu2n2+CNK
wZTDnrQoScCXNlWn5TuHtMbm054FdRR6iA6oNIcABREH/0baGwH9nXUSFG/JOLYY
YKlbR8c8CeTsjRmSGnsv0zd8QwTdNs88aU4z9KmrYPfyAGOMhhajsBc9k3Yi7K37
sTiy0sCmiJkxwTzMdWo6IgSR415ZyWdRBQUPLzIqX8rIBMp5iIbWa26e9swlBALW
zHSctBFWbjjysxjas7yfNcZA//FF30JxIMQI2Lrfi6yCX4CJbAM3TUQr19cETFDc
gEyPYz21hygNKW2ZUoYaXGpCFEIbH+anLi5UxcykS4ITkZECIE+m7j3C48/Bkciw
Lam6vlbSe2jVJlv2nIEeu0aVgplG04eKd3EQssEbPZygQJpv6eET/jaW7IXlSc/R
OJ7CYAQYEQIACQUCS7HP0AIbDAAhCRDpy9/Aq8CoVBYhBES8n9DWiOsAfE3QKenL
38CrwKhUGEgAnRU3scv4W3CVVWdhyiuK7K9SNh2vAKCSeJewZqZ1LPpblL2kIUXj
oQOV5w==
=7S1X
-----END PGP PUBLIC KEY BLOCK-----

@ -0,0 +1,20 @@
Patch by Robert Scheck <robert@fedoraproject.org> for libburn >= 1.5.4 to work around the Debian
specific aclocal/libtool behaviour not covering /usr/lib64 or /lib64 paths for 64 bit libraries.
--- libburn-1.5.4/configure 2021-01-30 13:00:19.000000000 +0100
+++ libburn-1.5.4/configure.rpath 2021-07-23 02:56:57.399348305 +0200
@@ -11219,10 +11219,13 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on

Binary file not shown.

@ -2,17 +2,17 @@
Summary: Library for reading, mastering and writing optical discs Summary: Library for reading, mastering and writing optical discs
Name: libburn Name: libburn
Version: 1.5.4 Version: 1.5.6
Release: 4%{?dist} Release: 6%{?dist}
License: GPLv2+ License: GPL-2.0-or-later
URL: https://libburnia-project.org/ URL: https://libburnia-project.org/
Source0: https://files.libburnia-project.org/releases/%{pkgname}-%{version}.tar.gz Source0: https://files.libburnia-project.org/releases/%{pkgname}-%{version}.tar.gz
Source1: https://files.libburnia-project.org/releases/%{pkgname}-%{version}.tar.gz.sig Source1: https://files.libburnia-project.org/releases/%{pkgname}-%{version}.tar.gz.sig
Source2: gpgkey-44BC9FD0D688EB007C4DD029E9CBDFC0ABC0A854.gpg Source2: https://keys.openpgp.org/vks/v1/by-fingerprint/44BC9FD0D688EB007C4DD029E9CBDFC0ABC0A854
Patch0: libburn-0.6.16-multilib.patch Patch0: libburn-0.6.16-multilib.patch
Patch1: libburn-1.5.4-rpath.patch
BuildRequires: gnupg2 BuildRequires: gnupg2
BuildRequires: gcc, make, intltool, gettext BuildRequires: gcc, make, intltool, gettext
BuildRequires: chrpath
%if 0%{?rhel} && "%{name}" != "%{pkgname}" %if 0%{?rhel} && "%{name}" != "%{pkgname}"
BuildRequires: autoconf, automake, libtool, pkgconfig BuildRequires: autoconf, automake, libtool, pkgconfig
%global variant 1 %global variant 1
@ -53,8 +53,6 @@ Summary: Limited cdrecord compatibility wrapper to ease migration to %{n
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires(post): %{_sbindir}/alternatives, coreutils Requires(post): %{_sbindir}/alternatives, coreutils
Requires(preun): %{_sbindir}/alternatives Requires(preun): %{_sbindir}/alternatives
Provides: cdrecord
Provides: wodim
%description -n cdrskin%{?variant} %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}
@ -64,6 +62,7 @@ features from the command line.
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %{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
%patch1 -p1 -b .rpath
# Rename from libburn to libburn1 for EPEL # Rename from libburn to libburn1 for EPEL
%if 0%{?rhel} && "%{name}" != "%{pkgname}" %if 0%{?rhel} && "%{name}" != "%{pkgname}"
@ -92,25 +91,20 @@ 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}
chrpath -d $RPM_BUILD_ROOT%{_bindir}/cdrskin
# RHEL ships a cdrskin package already # RHEL ships a cdrskin package already
%if 0%{?rhel} && "%{name}" != "%{pkgname}" %if 0%{?rhel} && "%{name}" != "%{pkgname}"
mv -f $RPM_BUILD_ROOT%{_bindir}/cdrskin{,%{?variant}} mv -f $RPM_BUILD_ROOT%{_bindir}/cdrskin{,%{?variant}}
mv -f $RPM_BUILD_ROOT%{_mandir}/man1/cdrskin{,%{?variant}}.1 mv -f $RPM_BUILD_ROOT%{_mandir}/man1/cdrskin{,%{?variant}}.1
%endif %endif
# Prepare alternatives handling for cdrecord, wodim -> cdrskin # Prepare alternatives handling for cdrecord -> cdrskin
touch $RPM_BUILD_ROOT{%{_bindir}/cdrecord,%{_mandir}/man1/cdrecord.1.gz} touch $RPM_BUILD_ROOT{%{_bindir}/cdrecord,%{_mandir}/man1/cdrecord.1.gz}
touch $RPM_BUILD_ROOT{%{_bindir}/wodim,%{_mandir}/man1/wodim.1.gz}
%ldconfig_scriptlets %ldconfig_scriptlets
%post -n cdrskin%{?variant} %post -n cdrskin%{?variant}
%{_sbindir}/alternatives --install %{_bindir}/cdrecord cdrecord %{_bindir}/cdrskin%{?variant} 60 \ %{_sbindir}/alternatives --install %{_bindir}/cdrecord cdrecord %{_bindir}/cdrskin%{?variant} 50 \
--slave %{_mandir}/man1/cdrecord.1.gz cdrecord-cdrecordman %{_mandir}/man1/cdrskin%{?variant}.1.gz \ --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
%preun -n cdrskin%{?variant} %preun -n cdrskin%{?variant}
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
@ -134,23 +128,44 @@ fi
%files -n cdrskin%{?variant} %files -n cdrskin%{?variant}
%ghost %{_bindir}/cdrecord %ghost %{_bindir}/cdrecord
%ghost %{_bindir}/wodim
%{_bindir}/cdrskin%{?variant} %{_bindir}/cdrskin%{?variant}
%ghost %{_mandir}/man1/cdrecord.1* %ghost %{_mandir}/man1/cdrecord.1*
%ghost %{_mandir}/man1/wodim.1*
%{_mandir}/man1/cdrskin%{?variant}.1* %{_mandir}/man1/cdrskin%{?variant}.1*
%changelog %changelog
* Tue Feb 08 2022 Jiri Kucera <jkucera@redhat.com> - 1.5.4-4 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.5.6-6
- Fix cdrecord & wodim alternatives - Bump release for October 2024 mass rebuild:
Related: #2015861 Resolves: RHEL-64018
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.5.6-5
- Bump release for June 2024 mass rebuild
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jun 20 2023 Robert Scheck <robert@fedoraproject.org> 1.5.6-1
- Upgrade to 1.5.6 (#2216132)
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.5.4-3 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.4-3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.5.4-2 * Fri Apr 09 2021 Robert Scheck <robert@fedoraproject.org> 1.5.4-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - Correct alternatives handling for cdrecord man page
* Mon Feb 08 2021 Robert Scheck <robert@fedoraproject.org> 1.5.4-1 * Mon Feb 08 2021 Robert Scheck <robert@fedoraproject.org> 1.5.4-1
- Upgrade to 1.5.4 (#1926008) - Upgrade to 1.5.4 (#1926008)

Loading…
Cancel
Save