.acl.metadata

@@ -1 +1 @@
-a5343e9f75326ffe5aa8d5d042e52227a3fd66cb SOURCES/acl-2.3.1.tar.gz
+6c9e46602adece1c2dae91ed065899d7f810bf01 SOURCES/acl-2.2.53.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/acl-2.3.1.tar.gz
+SOURCES/acl-2.2.53.tar.gz

SPECS/acl.spec

@@ -1,26 +1,23 @@
 Summary: Access control list utilities
 Name: acl
-Version: 2.3.1
-Release: 4%{?dist}
+Version: 2.2.53
+Release: 3%{?dist}
 BuildRequires: gawk
-BuildRequires: gcc
-BuildRequires: gettext
+BuildRequires: gettext-devel
 BuildRequires: libattr-devel
 BuildRequires: libtool
-BuildRequires: make
-BuildRequires: perl(FileHandle)
-Requires: libacl%{?_isa} = %{version}-%{release}
+Requires: libacl = %{version}-%{release}
 Source: https://download-mirror.savannah.gnu.org/releases/acl/acl-%{version}.tar.gz
 
+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-11833)
+# preserve failed setfacl return code (RHEL-3909)
 # https://git.savannah.nongnu.org/cgit/acl.git/commit/?id=7ce89c695e76ec41fcebd83f8b728f63b0361a2d
-Patch2: 0001-acl-2.3.1-setfacl-preserve-failed-status.patch
-
-License: GPLv2+
-URL: https://savannah.nongnu.org/projects/acl
+Patch2: 0001-acl-2.2.53-setfacl-preserve-failed-status.patch
 
 %description
 This package contains the getfacl and setfacl utilities needed for
@@ -29,6 +26,7 @@ manipulating access control lists.
 %package -n libacl
 Summary: Dynamic library for access control list support
 License: LGPLv2+
+Group: System Environment/Libraries
 Conflicts: filesystem < 3
 
 %description -n libacl
@@ -39,7 +37,8 @@ control lists.
 %package -n libacl-devel
 Summary: Files needed for building programs with libacl
 License: LGPLv2+
-Requires: libacl%{?_isa} = %{version}-%{release}, libattr-devel
+Group: Development/Libraries
+Requires: libacl = %{version}-%{release}, libattr-devel
 
 %description -n libacl-devel
 This package contains header files and documentation needed to develop
@@ -49,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
 
@@ -59,24 +61,21 @@ defined in POSIX 1003.1e draft standard 17.
 %make_build
 
 %check
-# make the test-suite use the just built library (instead of the system one)
-export LD_LIBRARY_PATH="${RPM_BUILD_ROOT}%{_libdir}:${LD_LIBRARY_PATH}"
-
 if ./setfacl -m "u:$(id -u):rwx" .; then
     if test 0 = "$(id -u)"; then
         # test/root/permissions.test requires the 'daemon' user to be a member
         # of the 'bin' group in order not to fail.  Prevent the test from
         # running if we detect that its requirements are not met (#1085389).
         if id -nG daemon | { ! grep bin >/dev/null; }; then
-            sed -e 's|test/root/permissions.test||' \
-                -i test/Makemodule.am Makefile.in Makefile
-        fi
+	    sed -e 's|test/root/permissions.test||' \
+	        -i test/Makemodule.am Makefile.in Makefile
+	fi
 
-        # test/root/setfacl.test fails if 'bin' user cannot access build dir
-        if ! runuser -u bin -- "${PWD}/setfacl" --version; then
-            sed -e 's|test/root/setfacl.test||' \
-                -i test/Makemodule.am Makefile.in Makefile
-        fi
+	# test/root/setfacl.test fails if 'bin' user cannot access build dir
+	if ! runuser -u bin -- "${PWD}/setfacl" --version; then
+	    sed -e 's|test/root/setfacl.test||' \
+	        -i test/Makemodule.am Makefile.in Makefile
+	fi
     fi
 
     # run the upstream test-suite
@@ -103,6 +102,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %ldconfig_scriptlets -n libacl
 
 %files -f %{name}.lang
+%{!?_licensedir:%global license %%doc}
 %license doc/COPYING*
 %{_bindir}/chacl
 %{_bindir}/getfacl
@@ -123,55 +123,12 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
-* Fri Oct 06 2023 Lukáš Zaoral <lzaoral@redhat.com> - 2.3.1-4
-- preserve failed setfacl return code (RHEL-11833)
+* Fri Oct 06 2023 Lukáš Zaoral <lzaoral@redhat.com> - 2.2.53-3
+- fix RPATH rpminspect reports
+- actually apply an included patch
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.1-3
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.1-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Mar 16 2021 Kamil Dudka <kdudka@redhat.com> - 2.3.1-1
-- new upstream release
-
-* Fri Mar 12 2021 Kamil Dudka <kdudka@redhat.com> - 2.3.0-1
-- new upstream release
-
-* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.53-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Aug 31 2020 Kamil Dudka <kdudka@redhat.com> 2.2.53-9
-- make __acl_create_entry_obj() work with LTO enabled (#1873975)
-
-* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.53-8
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.53-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jun 03 2020 Tom Stellard <tstellar@redhat.com> - 2.2.53-6
-- Spec file cleanups and build fix
-- Add BuildRequires: perl-FileHandle to fix make check
-- Add BuildRequres: gcc [1]
-- Use make_build [2] and make_install[3] macros
-- [1] https://docs.fedoraproject.org/en-US/packaging-guidelines/C_and_C++/#_buildrequires_and_requires
-- [2] https://docs.fedoraproject.org/en-US/packaging-guidelines/#_parallel_make
-- [3] https://docs.fedoraproject.org/en-US/packaging-guidelines/#_why_the_makeinstall_macro_should_not_be_used
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.53-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.53-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.53-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.53-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Fri Oct 06 2023 Lukáš Zaoral <lzaoral@redhat.com> - 2.2.53-2
+- preserve failed setfacl return code (RHEL-3909)
 
 * Mon Jul 02 2018 Kamil Dudka <kdudka@redhat.com> 2.2.53-1
 - new upstream release