From 8dd48eeb7592e8db35ce42b87a3ad64b88ed2a10 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: May 20 2013 12:35:08 +0000
Subject: automake: rebase to 1.13.2


Version: 1.13.2-1
Resolves: #963556

---

diff --git a/.gitignore b/.gitignore
index aa7fb33..d3e665e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ automake-1.11.1.tar.bz2
 /automake-1.11.5.tar.xz
 /automake-1.12.2.tar.xz
 /automake-1.13.1.tar.xz
+/automake-1.13.2.tar.xz
diff --git a/automake-1.13.1-disable-tests.patch b/automake-1.13.1-disable-tests.patch
index 069541f..5fc5086 100644
--- a/automake-1.13.1-disable-tests.patch
+++ b/automake-1.13.1-disable-tests.patch
@@ -2,15 +2,6 @@ diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
 index 591b4f0..20a9398 100644
 --- a/t/list-of-tests.mk
 +++ b/t/list-of-tests.mk
-@@ -130,8 +130,6 @@ t/amhello-cross-compile.sh \
- t/amhello-binpkg.sh \
- t/aminit-moreargs-deprecation.sh \
- t/amassign.sh \
--t/am-config-header-no-more.sh \
--t/am-prog-cc-stdc-no-more.sh \
- t/am-macro-not-found.sh \
- t/amopt.sh \
- t/amopts-location.sh \
 @@ -1202,16 +1200,6 @@ t/upc2.sh \
  t/upc3.sh \
  t/vala-configure.sh \
diff --git a/automake.spec b/automake.spec
index 93ded97..090b109 100644
--- a/automake.spec
+++ b/automake.spec
@@ -2,25 +2,18 @@
 
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake
-Version:    %{api_version}.1
-Release:    18%{?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
 
 Group:      Development/Tools
 Source:     ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz
-Source2:    tar-ustar-id-too-high.sh
 
-Patch0:     %{name}-%{version}-reenable-disabled-macros.patch
-Patch1:     %{name}-%{version}-disable-tests.patch
-
-# 'aclocal -I m4' should not fail when m4 does not exist
-# ~> http://lists.gnu.org/archive/html/bug-automake/2013-01/msg00115.html
-# ~> #901333
-# ~> already upstream (commits 7a3d7cee2 and c83c13355)
-Patch2:     %{name}-%{version}-non-existing-m4-dir.patch
-Patch3:     %{name}-%{version}-pax-hangs.patch
+# Disable tests for broken vala installation
+# ~> downstream
+Patch0:     %{name}-1.13.1-disable-tests.patch
 
 URL:        http://www.gnu.org/software/automake/
 Requires:   autoconf >= 2.65
@@ -68,11 +61,7 @@ Makefiles.
 
 %prep
 %setup -q -n automake-%{version}
-%patch0 -p1 -b .reenable_macros
-%patch1 -p1 -b .disable_tests
-%patch2 -p1 -b .non_existing_m4_dir
-%patch3 -p1 -b .pax-hangs
-cp %{SOURCE2} t/
+%patch0 -p1 -b .disable_tests
 autoreconf -iv
 
 # Fedora only to add ppc64p7 (Power7 optimized) arch:
@@ -82,7 +71,7 @@ perl -pi -e "s/ppc64-\*/ppc64-\* \| ppc64p7-\*/" lib/config.sub
 ./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
    --bindir=%{_bindir} --datadir=%{_datadir} --libdir=%{_libdir} \
    --docdir=%{_docdir}/%{name}-%{version} --disable-silent-rules
-make %{?_smp_mflags}
+make V=0 %{?_smp_mflags}
 cp m4/acdir/README README.aclocal
 cp contrib/multilib/README README.multilib
 
@@ -113,6 +102,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Thu May 16 2013 Pavel Raiskup <praiskup@redhat.com> - 1.13.2-1
+- update to automake 1.13.2 (#963556), remove (now) redundant patches
+
 * Thu May 03 2013 Petr Hracek <phracek@redhat.com> - 1.13.1-18
 - Patch pax hang up with big UID corrected on the base of upstream(#843379)
 
diff --git a/sources b/sources
index 296a5b0..461f37c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a60380ab11e1481376b7747d1b42ced2  automake-1.13.1.tar.xz
+497f3ea7e85504fe5b1b1b6d27cc71f1  automake-1.13.2.tar.xz