2 changed files with 57 additions and 108 deletions
--- a/am-utils-6.2-allow-autoconf-2.72.patch
+++ b/am-utils-6.2-allow-autoconf-2.72.patch
@ -1,28 +0,0 @@
-am-utils-6.2 - allow autoconf 2.72
-
-From: Ian Kent <raven@themaw.net>
-
-am-utils creates configure at build time and requires versions of autoconf
-that are known to work ok.
-
-Allow autoconf version 2.72 to get a build.
-
-Signed-off-by: Ian Kent <raven@themaw.net>
---
- bootstrap |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/bootstrap b/bootstrap
-index d454c63..55b2084 100755
--- a/bootstrap
-+++ b/bootstrap
-@@ -10,7 +10,8 @@ validateversion() {
-     case "$v" in
-     *2.69)	;;
-     *2.71)	;;
-    *)		echo "am-utils requires autoconf 2.69 or 2.71, you have:"
-+    *2.72)	;;
-+    *)		echo "am-utils requires autoconf 2.69, 2.71 or 2.72, you have:"
- 		echo "	$v"
- 		exit 1;;
-     esac
--- a/am-utils.spec
+++ b/am-utils.spec
@ -2,9 +2,8 @@ Summary: Automount utilities including an updated version of Amd
 Name: am-utils
 Version: 6.2.0
 %define upstream_version 6.2
-Release: 62%{?dist}
-# Automatically converted from old format: BSD - review is highly recommended.
-License: LicenseRef-Callaway-BSD
+Release: 56%{?dist}
+License: BSD
 Epoch: 5
 URL: http://am-utils.org
 # Git repository git://git.fsl.cs.sunysb.edu/am-utils-6.2.git
@ -27,7 +26,7 @@ BuildRequires: gcc
 BuildRequires: m4
 BuildRequires: libtirpc-devel
 BuildRequires: kernel-headers
-#BuildRequires: libnsl2-devel
+BuildRequires: libnsl2-devel
 BuildRequires: rpcsvc-proto-devel
 BuildRequires: make

@ -36,7 +35,7 @@ Requires: grep
 Requires: gawk
 Requires: findutils
 Requires: libtirpc
-#Requires: libnsl2
+Requires: libnsl2

 Requires(pre):    /usr/bin/grep
 Requires(post):   systemd-sysv
@ -104,8 +103,6 @@ Patch48: am-utils-6.2-dont-include-linux_mount_h.patch
 Patch49: am-utils-6.2-fix-fedora-mock-build-fail.patch
 Patch50: am-utils-configure-c99.patch

-Patch51: am-utils-6.2-allow-autoconf-2.72.patch
-
 # Not needed since autoreconf/libtool appear to do this automatically
 # Leaving it set doesn't appear to be a problem so leave it set in
 # case this changes.
@ -133,60 +130,58 @@ mounting and unmounting filesystems.
 %prep
 %setup -q -n %{name}-%{upstream_version}

-%patch -P 1 -p1
-%patch -P 2 -p1
-%patch -P 3 -p1
-%patch -P 4 -p1
-%patch -P 5 -p1
-%patch -P 6 -p1
-%patch -P 7 -p1
-%patch -P 8 -p1
-%patch -P 9 -p1
-%patch -P 10 -p1
-%patch -P 11 -p1
-%patch -P 12 -p1
-%patch -P 13 -p1
-%patch -P 14 -p1
-%patch -P 15 -p1
-%patch -P 16 -p1
-%patch -P 17 -p1
-%patch -P 18 -p1
-%patch -P 19 -p1
-%patch -P 20 -p1
-%patch -P 21 -p1
-%patch -P 22 -p1
-%patch -P 23 -p1
-%patch -P 24 -p1
-%patch -P 25 -p1
-%patch -P 26 -p1
-%patch -P 27 -p1
-%patch -P 28 -p1
-%patch -P 29 -p1
-%patch -P 30 -p1
-%patch -P 31 -p1
-%patch -P 32 -p1
-%patch -P 33 -p1
-%patch -P 34 -p1
-%patch -P 35 -p1
-%patch -P 36 -p1
-%patch -P 37 -p1
-%patch -P 38 -p1
-%patch -P 39 -p1
-%patch -P 40 -p1
-%patch -P 41 -p1
-%patch -P 42 -p1
-%patch -P 43 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
+%patch40 -p1
+%patch41 -p1
+%patch42 -p1
+%patch43 -p1

-%patch -P 44 -p1
-%patch -P 45 -p1
-%patch -P 46 -p1
+%patch44 -p1
+%patch45 -p1
+%patch46 -p1

-%patch -P 47 -p1
-%patch -P 48 -p1
-%patch -P 49 -p1
-%patch -P 50 -p1
-
-%patch -P 51 -p1
+%patch47 -p1
+%patch48 -p1
+%patch49 -p1
+%patch50 -p1

 ./bootstrap

@ -198,7 +193,9 @@ chmod +x find-requires
 %configure \
        --enable-shared \
        --enable-am-cflags="-DHAVE_LINUX_NFS_MOUNT_H" \
-        --enable-libs="-lresolv" \
+	--enable-cppflags="-I%{_includedir}/nsl" \
+	--enable-ldflags="-L%{_libdir}/nsl" \
+        --enable-libs="-lnsl -lresolv" \
 	--without-hesiod \
 	--enable-debug

@ -288,26 +285,6 @@ fi
 %{_libdir}/libamu.so*

 %changelog
-* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5:6.2.0-62
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5:6.2.0-61
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5:6.2.0-60
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Aug 28 2024 Miroslav Suchý <msuchy@redhat.com> - 5:6.2.0-59
- convert license to SPDX
-
-* Tue Jul 30 2024 Ian Kent <raven@themaw.net> - 5:6.2.0-58
- allow autoconf 2.72.
- remove BuildRequires (and Requires) libnsl2.
- also remove references to libnsl in configure invocation.
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5:6.2.0-57
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
 * Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5:6.2.0-56
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild