From 6c287597956e8ecd2efba1039e5ca3f3156fa2f0 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Thu, 4 Dec 2025 12:30:19 +0000
Subject: [PATCH] Import from AlmaLinux stable repository

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

diff --git a/.gitignore b/.gitignore
index a66e4f8..dbf4cd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 SOURCES/gpgkey-44BC9FD0D688EB007C4DD029E9CBDFC0ABC0A854.gpg
 SOURCES/libburn-1.5.4.tar.gz
+SOURCES/libburn-1.5.4.tar.gz.sig
diff --git a/.libburn.metadata b/.libburn.metadata
index 93d44a5..ed8e2f2 100644
--- a/.libburn.metadata
+++ b/.libburn.metadata
@@ -1,2 +1,3 @@
 896ddcb0c8d6e8b60a82642331350d7fde7ab737 SOURCES/gpgkey-44BC9FD0D688EB007C4DD029E9CBDFC0ABC0A854.gpg
 f1f6b91c18bcf0df1c38a0665657b10f1a76de58 SOURCES/libburn-1.5.4.tar.gz
+cdcc16b4041b3796428bbde7883d54f1d915b41c SOURCES/libburn-1.5.4.tar.gz.sig
diff --git a/SOURCES/libburn-1.5.4.tar.gz.sig b/SOURCES/libburn-1.5.4.tar.gz.sig
deleted file mode 100644
index 84a2176f731f417145de971d430a4bc58fa4a1e8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 72
zcmV-O0Jr~$Mg#y60ssaD0$>$OD*y@!5b4X`z^lNhRNIpPpo|Lb1zun1U#VcLr@ocT
eNP1w~8vvk(3GeGtbwNy?n~1Y17<=MKE>`5a#vTR$

diff --git a/SPECS/libburn.spec b/SPECS/libburn.spec
index e4a3fac..f0a4437 100644
--- a/SPECS/libburn.spec
+++ b/SPECS/libburn.spec
@@ -3,7 +3,7 @@
 Summary:         Library for reading, mastering and writing optical discs
 Name:            libburn
 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
@@ -51,6 +51,7 @@ for developing applications that use %{name}.
 %package -n      cdrskin%{?variant}
 Summary:         Limited cdrecord compatibility wrapper to ease migration to %{name}
 Requires:        %{name}%{?_isa} = %{version}-%{release}
+Requires(pre):   %{_sbindir}/alternatives, coreutils
 Requires(post):  %{_sbindir}/alternatives, coreutils
 Requires(preun): %{_sbindir}/alternatives
 Provides: cdrecord
@@ -106,6 +107,16 @@ touch $RPM_BUILD_ROOT{%{_bindir}/wodim,%{_mandir}/man1/wodim.1.gz}
 
 %ldconfig_scriptlets
 
+%pre -n cdrskin%{?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 ; do
+    [ -L %{_bindir}/$f ] || %{__rm} -f %{_bindir}/$f || :
+    [ -L %{_mandir}/man1/$f.1.gz ] || %{__rm} -f %{_mandir}/man1/$f.1.gz || :
+done
+
 %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 \
@@ -141,6 +152,9 @@ fi
 %{_mandir}/man1/cdrskin%{?variant}.1*
 
 %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
 - Fix cdrecord & wodim alternatives
   Related: #2015861