From 3a6985a11ef0ca925d1fc5485c0ffd2724e7bac6 Mon Sep 17 00:00:00 2001
From: Patrik Novotný <panovotn@redhat.com>
Date: Apr 21 2020 10:15:09 +0000
Subject: Rebase to upstream version 1.16.2


---

diff --git a/.gitignore b/.gitignore
index f8c4531..d65e35a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /automake-1.16.1.tar.xz
+/automake-1.16.2.tar.xz
diff --git a/automake.spec b/automake.spec
index e912748..7e99706 100644
--- a/automake.spec
+++ b/automake.spec
@@ -13,8 +13,8 @@
 
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake
-Version:    %{api_version}.1
-Release:    14%{?dist}
+Version:    %{api_version}.2
+Release:    1%{?dist}
 
 # docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
 License:    GPLv2+ and GFDL and Public Domain and MIT
@@ -28,11 +28,6 @@ Source3:    http://git.savannah.gnu.org/cgit/config.git/plain/config.guess
 Patch0:     automake-1.15-disable-vala-tests.patch
 %endif
 
-# BZ#1716384
-# automake bug#31222 - Don't use '\n' in sed substitution
-# http://git.savannah.gnu.org/cgit/automake.git/commit/?id=a348d830659fffd2cfc42994524783b07e69b4b5
-Patch1:     automake-1.16-pep3147-tweak-fix.patch
-
 URL:        http://www.gnu.org/software/automake/
 Requires:   autoconf >= 2.65
 
@@ -64,7 +59,7 @@ BuildRequires: expect
 BuildRequires: flex
 BuildRequires: gcc-gfortran
 BuildRequires: gettext-devel
-BuildRequires: java-devel-openjdk
+BuildRequires: java-11-openjdk-devel
 BuildRequires: libtool
 BuildRequires: ncompress
 BuildRequires: sharutils
@@ -141,6 +136,9 @@ make -k %{?_smp_mflags} check %{?TESTS_FLAGS: TESTS="%{TESTS_FLAGS}"} \
 
 
 %changelog
+* Tue Apr 21 2020 Patrik Novotný <panovotn@redhat.com> - 1.16.2-1
+- Rebase to upstream version 1.16.2
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.1-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index b48d15f..8f080f9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (automake-1.16.1.tar.xz) = 4013bd31f4903b10875caa7d6ac16a14623a4eb91aa758924dee5b990e234fb50848d131e2dbdbbbc32f89c41a14f9c52a0064c37aa6760c524d607b354b13c3
+SHA512 (automake-1.16.2.tar.xz) = a4aa0e41ceaa7df5bc303a6004597fb158f4198594017cd2c586fd9f5a29233e081766bf22b7e4ef0d4c8c3d45a8591009427efa319b362922a958ac1ef6e27b