From d9d32a82f05778dacb8e35d6d4e4fbde378cd00c Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Tue, 21 Jan 2025 15:53:16 +0000
Subject: [PATCH] import CS libisoburn-1.5.4-5.el9_5

---
 .gitignore                          |   1 +
 .libisoburn.metadata                |   1 +
 SOURCES/libisoburn-1.5.4.tar.gz.sig | Bin 72 -> 0 bytes
 SPECS/libisoburn.spec               |  16 +++++++++++++++-
 4 files changed, 17 insertions(+), 1 deletion(-)
 delete mode 100644 SOURCES/libisoburn-1.5.4.tar.gz.sig

diff --git a/.gitignore b/.gitignore
index 2eb2b4c..169c43b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 SOURCES/gpgkey-44BC9FD0D688EB007C4DD029E9CBDFC0ABC0A854.gpg
 SOURCES/libisoburn-1.5.4.tar.gz
+SOURCES/libisoburn-1.5.4.tar.gz.sig
diff --git a/.libisoburn.metadata b/.libisoburn.metadata
index c4958d0..ab78ce3 100644
--- a/.libisoburn.metadata
+++ b/.libisoburn.metadata
@@ -1,2 +1,3 @@
 896ddcb0c8d6e8b60a82642331350d7fde7ab737 SOURCES/gpgkey-44BC9FD0D688EB007C4DD029E9CBDFC0ABC0A854.gpg
 e0adbfb01487b5f5c1b28554a027e15309977f00 SOURCES/libisoburn-1.5.4.tar.gz
+15d89d2250f4c60f3780fb419cf475b12bf17759 SOURCES/libisoburn-1.5.4.tar.gz.sig
diff --git a/SOURCES/libisoburn-1.5.4.tar.gz.sig b/SOURCES/libisoburn-1.5.4.tar.gz.sig
deleted file mode 100644
index 9a0f66f4663821108f06ba82e7d35a9db8490f05..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 72
zcmV-O0Jr~$Mg#y60ssaD0$>$xC;$ox5b4X`z^lNhRQvM)pJ=&dk>rX?i{ZNek9!~J
eRO`+K_yC?Jy&tmJp5Cn_^v)J8eEU<k@R)%n^&)=&

diff --git a/SPECS/libisoburn.spec b/SPECS/libisoburn.spec
index df5fc8b..f72bd6b 100644
--- a/SPECS/libisoburn.spec
+++ b/SPECS/libisoburn.spec
@@ -3,7 +3,7 @@
 Summary:         Library to enable creation and expansion of ISO-9660 filesystems
 Name:            libisoburn
 Version:         1.5.4
-Release:         4%{?dist}
+Release:         5%{?dist}
 License:         GPLv2+
 URL:             https://libburnia-project.org/
 Source0:         https://files.libburnia-project.org/releases/%{pkgname}-%{version}.tar.gz
@@ -69,6 +69,7 @@ Requires:        kf5-filesystem >= 5
 Requires(post):  /sbin/install-info
 Requires(preun): /sbin/install-info
 %endif
+Requires(pre):   %{_sbindir}/alternatives, coreutils
 Requires(post):  %{_sbindir}/alternatives, coreutils
 Requires(preun): %{_sbindir}/alternatives
 Provides: cdrecord
@@ -178,6 +179,16 @@ cd releng
 
 %ldconfig_scriptlets
 
+%pre -n xorriso%{?variant}
+# remove alternativized files if they are not symlinks
+# otherwise upgrades from non-alternativized versions do not work
+# the list of files should be kept in sync with the "alternatives"
+# commands in %%post
+for f in cdrecord wodim mkisofs genisoimage ; do
+    [ -L %{_bindir}/$f ] || %{__rm} -f %{_bindir}/$f || :
+    [ -L %{_mandir}/man1/$f.1.gz ] || %{__rm} -f %{_mandir}/man1/$f.1.gz || :
+done
+
 %post -n xorriso%{?variant}
 %if 0%{?rhel} == 7
 /sbin/install-info %{_infodir}/xorrecord.info.gz %{_infodir}/dir || :
@@ -250,6 +261,9 @@ fi
 %endif
 
 %changelog
+* Wed Jan 15 2025 Pavel Cahyna <pcahyna@redhat.com> - 1.5.4-5
+- Fix upgrades from non-alternativized versions/packages
+
 * Tue Feb 08 2022 Jiri Kucera <jkucera@redhat.com> - 1.5.4-4
 - Provide alternatives
   Resolves: #1967484