From 583cc9f9684c382688ce47af2800a797fdf20a91cf422f4dcda4eab5e989a824 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Schr=C3=B6der?= <mls@suse.com>
Date: Tue, 17 Dec 2024 10:00:45 +0000
Subject: [PATCH] allow the buildroot to be a symbolic link in check-files

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=681
---
 buildroot-symlink.diff | 10 ++++++++++
 rpm.changes            |  6 ++++++
 rpm.spec               |  3 ++-
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 buildroot-symlink.diff

diff --git a/buildroot-symlink.diff b/buildroot-symlink.diff
new file mode 100644
index 0000000..fe6c4f1
--- /dev/null
+++ b/buildroot-symlink.diff
@@ -0,0 +1,10 @@
+--- scripts/check-files.orig	2024-12-17 09:47:18.016502845 +0000
++++ scripts/check-files	2024-12-17 09:50:09.872159687 +0000
+@@ -27,6 +27,6 @@ trap "rm -f \"${FILES_DISK}\"" 0 2 3 5 1
+ 
+ # Find non-directory files in the build root and compare to the manifest.
+ # TODO: regex chars in last sed(1) expression should be escaped
+-find "${RPM_BUILD_ROOT}" -type f -o -type l | LC_ALL=C sort > "${FILES_DISK}"
++find -H "${RPM_BUILD_ROOT}" -type f -o -type l | LC_ALL=C sort > "${FILES_DISK}"
+ LC_ALL=C sort | diff -d "${FILES_DISK}" - | sed -n -e 's!^\(-\|< \)'"${RPM_BUILD_ROOT}"'/usr/share/info/dir$!!' -e 's!^\(-\|< \)'"${RPM_BUILD_ROOT}"'\(.*\)$!   \2!gp'
+ 
diff --git a/rpm.changes b/rpm.changes
index 5d2c621..3f3cba5 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Dec 17 10:59:26 CET 2024 - mls@suse.de
+
+- allow the buildroot to be a symbolic link in check-files
+  (needed for pesign-obs-integration)
+
 -------------------------------------------------------------------
 Mon Dec 16 11:55:23 CET 2024 - mls@suse.de
 
diff --git a/rpm.spec b/rpm.spec
index f84ab61..931645d 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -120,6 +120,7 @@ Patch140:       0001-Add-option-to-set-mtime-of-files-in-rpms.patch
 Patch141:       0002-log-build-time-if-it-is-set-from-SOURCE_DATE_EPOCH.patch
 Patch142:       0003-Error-out-on-a-missing-changelog-date.patch
 Patch150:       unshare.diff
+Patch151:       buildroot-symlink.diff
 Patch6464:      auto-config-update-aarch64-ppc64le.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
@@ -234,7 +235,7 @@ rm -rf sqlite
 %patch -P 140
 %endif
 %patch -P 141 -P 142
-%patch -P 150
+%patch -P 150 -P 151
 
 %ifarch aarch64 ppc64le riscv64
 %patch -P 6464