From cd603ea12f9d37a60e85a27b3f2f976c1b9d9ed48c8c3ed22eca848832e742f9 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Tue, 14 Jul 2020 12:56:15 +0000
Subject: [PATCH] Accepting request 820641 from home:gmbr3:testing

- Add etags to BuildRequires for testsuite
- Add automake-testsuite-vala-gcc10.patch: fixes testsuite

OBS-URL: https://build.opensuse.org/request/show/820641
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=80
---
 automake-testsuite-vala-gcc10.patch | 23 +++++++++++++++++++++++
 automake.changes                    |  6 ++++++
 automake.spec                       |  3 +++
 3 files changed, 32 insertions(+)
 create mode 100644 automake-testsuite-vala-gcc10.patch

diff --git a/automake-testsuite-vala-gcc10.patch b/automake-testsuite-vala-gcc10.patch
new file mode 100644
index 0000000..876e0f6
--- /dev/null
+++ b/automake-testsuite-vala-gcc10.patch
@@ -0,0 +1,23 @@
+https://lists.gnu.org/archive/html/bug-automake/2020-06/msg00003.html
+
+diff --git a/t/vala-mix2.sh b/t/vala-mix2.sh
+index 8e6a214..933a3ff 100644
+--- a/t/vala-mix2.sh
++++ b/t/vala-mix2.sh
+@@ -44,7 +44,7 @@ int main ()
+ END
+ 
+ cat > foo.h <<'END'
+-int foo;
++extern int foo;
+ int bar (void);
+ int baz (void);
+ END
+@@ -56,7 +56,7 @@ END
+ 
+ cat > baz.c <<'END'
+ #include "foo.h"
+-extern int foo = 0;
++int foo = 0;
+ int baz (void) { return 0; }
+ END
diff --git a/automake.changes b/automake.changes
index ae0d419..f265550 100644
--- a/automake.changes
+++ b/automake.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul 10 14:54:32 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
+
+- Add etags to BuildRequires for testsuite
+- Add automake-testsuite-vala-gcc10.patch: fixes testsuite
+
 -------------------------------------------------------------------
 Sun Jul  5 16:19:34 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
 
diff --git a/automake.spec b/automake.spec
index 7926a1f..9525c1a 100644
--- a/automake.spec
+++ b/automake.spec
@@ -36,6 +36,7 @@ Source3:        automake-rpmlintrc
 Patch2:         automake-require_file.patch
 Patch3:         automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch
 Patch5:         0001-correct-parameter-parsing-in-test-driver-script.patch
+Patch6:         automake-testsuite-vala-gcc10.patch
 Patch100:       automake-SuSE.patch
 BuildRequires:  autoconf >= 2.69
 BuildRequires:  bison
@@ -62,6 +63,7 @@ BuildRequires:  pkgconfig
 BuildRequires:  python
 BuildRequires:  sharutils
 BuildRequires:  zip
+BuildRequires:  etags
 Requires:       expect
 Requires:       flex
 Requires:       libtool
@@ -82,6 +84,7 @@ definitions (with rules occasionally thrown in).  The generated
 %patch2 -p1
 %patch3 -p1
 %patch5 -p1
+%patch6 -p1
 %patch100
 
 %build