0001-Fix-infinite-loop-when-perl-is-added-in-BEP_FILE_TIM.patch

@@ -1,53 +0,0 @@
-From bee9daf0008cb7b7b7516090e60a8f52b7d214d7 Mon Sep 17 00:00:00 2001
-From: Wenchao Hao <haowenchao@huawei.com>
-Date: Wed, 1 Dec 2021 11:10:06 +0800
-Subject: [PATCH] Fix infinite loop when perl is added in BEP_FILE_TIME_LIST
-
-Makefile specify a rules like following:
-
-configure include/builddefs include/config.h: aclocal.m4
-	autoconf
-	./configure \
-	...
-Normally, this rule would run recipe for target configure first, and the
-include/builddefs and include/config.h would be generated in this target.
-
-While once perl is added in BEP_FILE_TIME_LIST, this rule run recipe for target
-include/builddefs first and cause a infinite loop.
-
-To fix this issue, splict previous recipe as following to explictly tell make
-run configure first
-
-include/builddefs: configure
-include/config.h: configure
-
-configure: aclocal.m4
-	autoconf \
-	./configure \
-	...
-
-Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
-Signed-off-by: volcanodragon <linfeilong@huawei.com>
----
- Makefile | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 5302e11..fa3d93b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -59,7 +59,10 @@ else
- clean:	# if configure hasn't run, nothing to clean
- endif
- 
--$(CONFIGURE): aclocal.m4
-+include/builddefs: configure
-+include/config.h: configure
-+
-+configure: aclocal.m4
- 	autoconf
- 	./configure \
- 		--prefix=/ \
--- 
-1.8.3.1
-

0002-build-do-not-generate-aclocal.m4.patch

@@ -1,47 +0,0 @@
-From c0819ccf8ddf3fffffe69c5f77387a30a9704e00 Mon Sep 17 00:00:00 2001
-From: Wenchao Hao <haowenchao@huawei.com>
-Date: Mon, 10 Jan 2022 20:56:24 +0800
-Subject: [PATCH] build: do not generate aclocal.m4
-
-Since autoconf updated, aclocal would report following error:
-
-aclocal --output=aclocal.m4
-Attempt to reload Scalar/Util.pm aborted.
-Compilation failed in require at /usr/share/perl5/vendor_perl/File/Temp.pm line 153.
-BEGIN failed--compilation aborted at /usr/share/perl5/vendor_perl/File/Temp.pm line 153.
-Compilation failed in require at /usr/share/autoconf/Autom4te/General.pm line 44.
-BEGIN failed--compilation aborted at /usr/share/autoconf/Autom4te/General.pm line 44.
-Compilation failed in require at /usr/bin/autom4te line 47.
-BEGIN failed--compilation aborted at /usr/bin/autom4te line 47.
-aclocal: error: autom4te failed with exit status: 255
-make: *** [Makefile:78: aclocal.m4] Error 255
-
-aclocal command is to generate aclocal.m4 from configure.ac, this file is would not
-change.
-
-And origin tar package contains aclocal.m4 file which generated from configure.ac.
-aclocal.m4 generated in Makefile is same with aclocal.m4 in tar package. Here do not
-generate in Makefile
-
-Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index fa3d93b..6aaf672 100644
---- a/Makefile
-+++ b/Makefile
-@@ -62,7 +62,7 @@ endif
- include/builddefs: configure
- include/config.h: configure
- 
--configure: aclocal.m4
-+configure:
- 	autoconf
- 	./configure \
- 		--prefix=/ \
--- 
-1.8.3.1
-

0003-acl_nfs4_get_who-removed-an-always-false-evaluate-wa.patch

@@ -1,26 +0,0 @@
-From 09668147a05b45ba0e1134b6ddd2be28cadfbc11 Mon Sep 17 00:00:00 2001
-From: Steve Dickson <steved@redhat.com>
-Date: Thu, 16 Jun 2022 16:24:19 -0400
-Subject: [PATCH] acl_nfs4_get_who: removed an always false evaluate warning
-
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- libnfs4acl/acl_nfs4_get_who.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libnfs4acl/acl_nfs4_get_who.c b/libnfs4acl/acl_nfs4_get_who.c
-index 695db2e..3e2fd7c 100644
---- a/libnfs4acl/acl_nfs4_get_who.c
-+++ b/libnfs4acl/acl_nfs4_get_who.c
-@@ -49,7 +49,7 @@ int acl_nfs4_get_who(struct nfs4_ace* ace, int* type, char** who)
- 	char* iwho = NULL;
- 	int wholen;
- 
--	if (ace == NULL || ace->who == NULL)
-+	if (ace == NULL)
- 		goto inval_failed;
- 
- 	itype = acl_nfs4_get_whotype(ace->who);
--- 
-2.39.2
-

nfs4-acl-tools.spec

@@ -1,16 +1,12 @@
 Name:           nfs4-acl-tools
 Version:        0.3.7
-Release:        6
+Release:        1
 Summary:        The nfs4 ACL tools
-License:        BSD or GPLv2+ or LGPLv2.1
+License:        BSD
 URL:            http://www.citi.umich.edu/projects/nfsv4/linux/
 Source0:        http://linux-nfs.org/~bfields/nfs4-acl-tools/%{name}-%{version}.tar.gz
 
-BuildRequires: libtool libattr-devel
+BuildRequires: libtool git libattr-devel
-
-Patch1:        0001-Fix-infinite-loop-when-perl-is-added-in-BEP_FILE_TIM.patch
-Patch2:        0002-build-do-not-generate-aclocal.m4.patch
-Patch3:        0003-acl_nfs4_get_who-removed-an-always-false-evaluate-wa.patch
 
 %description
 It contains commandline NFSv4 ACL tools, which deal directly with NFSv4 ACLs.
@@ -23,7 +19,7 @@ Requires:       man
 This contains man files for the using of nfs4-acl-tools.
 
 %prep
-%autosetup -n %{name}-%{version} -p1
+%autosetup -n %{name}-%{version} -p1 -S git
 
 %build
 %configure
@@ -46,21 +42,6 @@ make DESTDIR=%{buildroot} install
 %{_mandir}/man*/*
 
 %changelog
-* Tue Jul 30 2024 wuguanghao <wuguanghao3@huawei.com> - 0.3.7-6
-- acl_nfs4_get_who: removed an always false evaluate warning
-
-* Tue Oct 18 2022 zhanchengbin <zhanchengbin1@huawei.com> - 0.3.7-5
-- license: fix license error.
-
-* Mon Jan 10 2022 Wenchao Hao <haowenchao@huawei.com> - 0.3.7-4
-- DESC: build: do not generate aclocal.m4 to fix compile error
-
-* Wed Dec 1 2021 volcanodragon <linfeilong@huawei.com> - 0.3.7-3
-- DESC: Fix infinite loop when perl is added in BEP_FILE_TIME_LIST
-
-* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 0.3.7-2
-- DESC: delete -S git from %autosetup, and delete BuildRequires git
-
 * Thu Jul 16 2020 wuguanghao <wuguanghao3@huawei.com> - 0.3.7-1
 - update nfs4-acl-tools version to 0.3.7-1