Accepting request 1188230 from GNOME:Factory

- Add automake-1.17.patch to support Automake 1.17 in autogen.sh

OBS-URL: https://build.opensuse.org/request/show/1188230
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk2?expand=0&rev=187

automake-1.17.patch

@@ -0,0 +1,30 @@
+--- a/autogen.sh	2020-12-21 02:09:37.000000000 +0100
++++ b/autogen.sh	2024-07-15 23:16:24.836488891 +0200
+@@ -48,7 +48,10 @@
+ 	DIE=1
+ }
+ 
+-if automake-1.16 --version < /dev/null > /dev/null 2>&1 ; then
++if automake-1.17 --version < /dev/null > /dev/null 2>&1 ; then
++    AUTOMAKE=automake-1.17
++    ACLOCAL=aclocal-1.17
++else if automake-1.16 --version < /dev/null > /dev/null 2>&1 ; then
+     AUTOMAKE=automake-1.16
+     ACLOCAL=aclocal-1.16
+ else if automake-1.15 --version < /dev/null > /dev/null 2>&1 ; then
+@@ -75,13 +78,14 @@
+ else
+ 	echo
+ 	echo "You must have automake 1.7.x, 1,10.x, 1.11.x, 1.12.x, 1.13.x, 1.14.x,"
+-	echo "1.15.x or 1.16.x installed to compile $PROJECT."
++	echo "1.15.x, 1.16.x, or 1.17.x installed to compile $PROJECT."
+ 	echo "Install the appropriate package for your distribution,"
+ 	echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
+ 	DIE=1
+ fi
+ fi
+ fi
++fi
+ fi
+ fi
+ fi

gtk2.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 16 05:39:23 UTC 2024 - Christoph G <foss@grueninger.de>
+
+- Add automake-1.17.patch to support Automake 1.17 in autogen.sh
+
 -------------------------------------------------------------------
 Fri Jul 12 18:40:00 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
 

gtk2.spec

@@ -56,6 +56,8 @@ Patch9:         gtk2-check-attribute.patch
 Patch10:        gtk2-gcc14.patch
 # PATCH-FIX-UPSTREAM CVE-2024-6655.patch -- CVE-2024-6655 Stop looking for modules in cwd
 Patch11:        CVE-2024-6655.patch
+# PATCH-FEATURE-OPENSUSE automake-1.17.patch -- Add automake 1.17 support to autogen.sh
+Patch12:        automake-1.17.patch
 
 BuildRequires:  cairo-devel
 BuildRequires:  cups-devel
@@ -329,6 +331,7 @@ cp -a %{SOURCE2} .
 %patch -P 9 -p1
 %patch -P 10 -p1
 %patch -P 11 -p1
+%patch -P 12 -p1
 gnome-patch-translation-update
 
 %build