[autoconf/f17] add spec file fixes from Ralf Corsépius (bz 823770)

[Karsten Hopp]

commit 1bb43cbf2727f6f958ab23bd585f7211920b4356
Author: Karsten Hopp <karsten at redhat.com>
Date:   Mon Jun 18 13:47:25 2012 +0200

    add spec file fixes from Ralf Corsépius (bz 823770)

 autoconf.spec |   53 ++++++++++++++++++++++++++++++++---------------------
 1 files changed, 32 insertions(+), 21 deletions(-)
---
diff --git a/autoconf.spec b/autoconf.spec
index 5cdad02..91948a3 100644
--- a/autoconf.spec
+++ b/autoconf.spec
@@ -1,7 +1,7 @@
 Summary:    A GNU tool for automatically configuring source code
 Name:       autoconf
 Version:    2.68
-Release:    3%{?dist}
+Release:    4%{?dist}
 License:    GPLv2+ and GFDL
 Group:      Development/Tools
 Source:     http://ftpmirror.gnu.org/autoconf/autoconf-%{version}.tar.xz
@@ -10,32 +10,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
+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 libtool gcc-gfortran
-%if 0%{?fedora}
-BuildRequires: erlang
-%endif
-%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.
@@ -67,8 +65,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
@@ -98,9 +97,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 at redhat.com> 2.68-4
+- add spec file fixes from Ralf Corsépius (bz 823770):
+- 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.
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.68-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild