From 0f88233d01d956368828ac2ae034e9a4f9b5b5b0 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: Mon, 18 Jun 2012 13:22:15 +0200
Subject: [PATCH] =?UTF-8?q?spec=20file=20changes=20by=20Ralf=20Cors=C3=A9p?=
 =?UTF-8?q?ius=20(bz=20#823770)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 autoconf.spec | 50 ++++++++++++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/autoconf.spec b/autoconf.spec
index bd80199..0c3e234 100644
--- a/autoconf.spec
+++ b/autoconf.spec
@@ -1,7 +1,7 @@
 Summary:    A GNU tool for automatically configuring source code
 Name:       autoconf
 Version:    2.69
-Release:    1%{?dist}
+Release:    2%{?dist}
 License:    GPLv2+ and GFDL
 Group:      Development/Tools
 Source:     http://ftpmirror.gnu.org/autoconf/autoconf-%{version}.tar.xz
@@ -9,29 +9,30 @@ URL:        http://www.gnu.org/software/autoconf/
 BuildArch: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# run "make check" by default
+%bcond_without check
+
 # m4 >= 1.4.6 is required, >= 1.4.14 is recommended:
 BuildRequires:      m4 >= 1.4.14
 Requires:           m4 >= 1.4.14
 BuildRequires:      emacs
 # the filtering macros are currently in /etc/rpm/macros.perl:
-BuildRequires:      perl-devel >= 5.6
+BuildRequires:      perl-macros
+BuildRequires:      perl(Data::Dumper)
+
+
+%if %{with check}
+# For extended testsuite coverage
+BuildRequires:      gcc-gfortran
+BuildRequires:      erlang
+%endif
+
 Requires(post):     /sbin/install-info
 Requires(preun):    /sbin/install-info
 
-# run "make check" by default
-%{?_without_check: %define _without_check 1}
-%{!?_without_check: %define _without_check 0}
-%if ! %{_without_check}
-BuildRequires: automake
-%endif
-
 # filter out bogus perl(Autom4te*) dependencies
-%define _use_internal_dependency_generator 0
-%{?perl_default_filter:
-%filter_from_provides /^perl(Autom4te::/d
-%filter_from_requires /^perl(Autom4te::/d
-%perl_default_filter
-}
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Autom4te::
+%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Autom4te::
 
 %description
 GNU's Autoconf is a tool for configuring source code and Makefiles.
@@ -62,8 +63,9 @@ make
 # 199: autotest.at  parallel autotest and signal handling
 # In test/autotest.at, under comment "Test PIPE", the exit code written
 # to file "status" is 0.  Report mailed to bug-autoconf.
-%if ! %{_without_check}
-make check TESTSUITEFLAGS='-198 200-'
+# make check TESTSUITEFLAGS='-198 200-'
+%if %{with check}
+make check
 %endif
 
 %install
@@ -93,9 +95,21 @@ fi
 %dir %{_datadir}/emacs/
 %{_datadir}/emacs/site-lisp/
 %{_mandir}/man1/*
-%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
+%doc AUTHORS COPYING* ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Mon Jun 18 2012 Karsten Hopp <karsten@redhat.com> 2.69-2
+- spec file changes by Ralf Corsépius:
+- Use %%bcond_without for --with/out=check.
+- Add BR: perl(Data::Dumper).
+- Remove BR: automake (Testsuite doesn't need automake).
+- Add BR: gcc-gfortran, erlang (Extend testsuite).
+- Remove TESTSUITEFLAGS (Was referring to autoconf < 2.69).
+- Add rpm-4.9 perl-filters %%__provides_exclude, %%__requires_exclude.
+  Remove rpm-4.8 perl-filters (Address RHBZ 823770).
+- Reflect autoconf being GPLv3'ed.
+- Add BR: perl-macros, Remove BR: perl-devel
+
 * Tue May 15 2012 Karsten Hopp <karsten@redhat.com> 2.69-1
 - update to 2.69