From 64d42070c251d4b78dc897999b1ff36c5be04002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
Date: Fri, 6 Oct 2023 17:29:05 +0200
Subject: [PATCH] fix RPATH rpminspect reports

... and actually apply an included patch

Related: RHEL-3909
---
 acl.spec | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/acl.spec b/acl.spec
index 5da2dd2..63cc137 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,9 +1,9 @@
 Summary: Access control list utilities
 Name: acl
 Version: 2.2.53
-Release: 2%{?dist}
+Release: 3%{?dist}
 BuildRequires: gawk
-BuildRequires: gettext
+BuildRequires: gettext-devel
 BuildRequires: libattr-devel
 BuildRequires: libtool
 Requires: libacl = %{version}-%{release}
@@ -12,9 +12,12 @@ Source: https://download-mirror.savannah.gnu.org/releases/acl/acl-%{version}.tar
 License: GPLv2+
 URL: https://savannah.nongnu.org/projects/acl
 
+# avoid permission denied problem with LD_PRELOAD in the test-suite
+Patch1: 0001-acl-2.2.53-test-runwrapper.patch
+
 # preserve failed setfacl return code (RHEL-3909)
 # https://git.savannah.nongnu.org/cgit/acl.git/commit/?id=7ce89c695e76ec41fcebd83f8b728f63b0361a2d
-Patch1: 0001-acl-2.2.53-setfacl-preserve-failed-status.patch
+Patch2: 0001-acl-2.2.53-setfacl-preserve-failed-status.patch
 
 %description
 This package contains the getfacl and setfacl utilities needed for
@@ -45,6 +48,9 @@ defined in POSIX 1003.1e draft standard 17.
 %prep
 %autosetup -p1
 
+# newer autoconf fixes rpath warnings from rpminspect
+autoreconf -fvi
+
 %build
 %configure
 
@@ -52,7 +58,7 @@ defined in POSIX 1003.1e draft standard 17.
 # sed -i 's/-O2/-O0/' libtool include/builddefs
 # unset CFLAGS
 
-make %{?_smp_mflags}
+%make_build
 
 %check
 if ./setfacl -m "u:$(id -u):rwx" .; then
@@ -73,14 +79,14 @@ if ./setfacl -m "u:$(id -u):rwx" .; then
     fi
 
     # run the upstream test-suite
-    make check || exit $?
+    %make_build check || exit $?
 else
     echo '*** ACLs are probably not supported by the file system,' \
          'the test-suite will NOT run ***'
 fi
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 
 # get rid of libacl.a and libacl.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.a
@@ -117,6 +123,10 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Fri Oct 06 2023 Lukáš Zaoral <lzaoral@redhat.com> - 2.2.53-3
+- fix RPATH rpminspect reports
+- actually apply an included patch
+
 * Fri Oct 06 2023 Lukáš Zaoral <lzaoral@redhat.com> - 2.2.53-2
 - preserve failed setfacl return code (RHEL-3909)