Remove config.{sub,guess} from sources

We now rely on either the original version provided by automake, or an
expected newer version provided by redhat-rpm-config.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>

automake.spec

@@ -21,8 +21,6 @@ Release:    5%{?dist}
 License:    GPLv2+ and GFDL and Public Domain and MIT
 
 Source:     ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz
-Source2:    http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
-Source3:    http://git.savannah.gnu.org/cgit/config.git/plain/config.guess
 
 # ~> downstream
 # The patch is only made necessary due to fedora specific changes
@@ -96,14 +94,11 @@ Makefiles.
 autoreconf -iv
 %endif
 
-for file in %SOURCE2 %SOURCE3; do
-    for dest in $(find -name "$(basename "$file")"); do
-        cp "$file" "$dest"
-    done
-done
-
 
 %build
+# redhat-rpm-config package, which provides this configure macro, will overwrite
+# the config.sub and config.guess files intentionally. The automake maintainer
+# needs to check that those files are provided up to date.
 %configure
 %make_build
 cp m4/acdir/README README.aclocal
@@ -138,6 +133,7 @@ make -k %{?_smp_mflags} check %{?TESTS_FLAGS: TESTS="%{TESTS_FLAGS}"} \
 %changelog
 * Tue May 17 2022 Frederic Berat <fberat@redhat.com> - 1.16.5-5
 - Fix fort2.sh test
+- Remove external config.sub and config.guess as they are overwritten anyway
 
 * Mon Feb 07 2022 Frederic Berat <fberat@redhat.com> - 1.16.5-4
 - Switch to java-devel as a build requirement (#2051135)

sync_gnuconfig.sh

@@ -1,33 +0,0 @@
-#!/bin/bash
-
-die() { echo >&2 "$@"; exit 1; }
-
-lines=`git status --porcelain | grep -v ^?? | wc -l`
-test "$lines" != "0" && die "stash the git changes"
-
-if test -d config; then
-    cd config
-    git pull
-    cd ..
-else
-    git clone git://git.savannah.gnu.org/config.git
-fi
-
-
-cp config/config.guess .
-cp config/config.sub .
-
-lines=`git status --porcelain config.guess config.sub | wc -l`
-if test "$lines" = "0"; then
-    echo "no upstream change"
-    exit 0
-fi
-
-make -C config check || die "make check failed"
-
-rpmdev-bumpspec automake.spec \
-        -c "update config.{guess,sub} to gnuconfig git HEAD" \
-    || die "can not bump spec"
-
-git add -f config.sub config.guess automake.spec
-git commit -m "gnuconfig: sync with upstream git" --no-verify