autotools-git/autoconf: require SCL-ized m4

This is important for RHEL5 where is too old m4 packaged.

1 files changed, 15 insertions, 6 deletions

diff --git a/repos/autotools/autotools-git/autoconf/autoconf.spec b/repos/autotools/autotools-git/autoconf/autoconf.spec
index f89d6ee..7599462 100644
--- a/repos/autotools/autotools-git/autoconf/autoconf.spec
+++ b/repos/autotools/autotools-git/autoconf/autoconf.spec
@@ -7,9 +7,9 @@
 %{?scl:%scl_package autoconf}
 
 Summary:    A GNU tool for automatically configuring source code
-Name:       %{scl_prefix}autoconf
+Name:       %{?scl_prefix}autoconf
 Version:    2.69
-Release:    3.%{commits_from_release}.%{git_hash}%{?dist}
+Release:    4.%{commits_from_release}.%{git_hash}%{?dist}
 License:    GPLv2+ and GFDL
 Group:      Development/Tools
 Source0:    autoconf-2.69.117-1717-dirty.tar.gz
@@ -18,14 +18,14 @@ BuildArch: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # run "make check" by default
-%bcond_without check
+%bcond_with check
 
 # m4 >= 1.4.6 is required, >= 1.4.14 is recommended;  We have 1.4.5 in rhel5,
 # 1.4.13 in rhel6, so don't build for el5 yet - this requires workaround with
 # probably empty 'm4' SCLized package for OK platforms, don't know what is
 # proper way.
-BuildRequires:      m4 >= 1.4.6, help2man
-Requires:           m4 >= 1.4.6
+BuildRequires:      %{?scl_prefix}m4, help2man
+Requires:           %{?scl_prefix}m4
 BuildRequires:      emacs
 
 %if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
@@ -77,17 +77,23 @@ their use.
 %setup -q -n autoconf-%{version}.%{commits_from_release}-%{git_hash}-dirty
 
 %build
+scl enable autotools-git - <<\EOF
 %configure
 # not parallel safe
 make
+EOF
 
 %check
-%if %{without check}
+%if %{with check}
+scl enable autotools-git - <<\EOF
 make check # TESTSUITEFLAGS='1-198 200-' # will disable nr. 199.
+EOF
 %endif
 
 %install
+scl enable autotools-git - <<\EOF
 make install DESTDIR=%{buildroot}
+EOF
 mkdir -p %{buildroot}/share
 
 %post
@@ -112,6 +118,9 @@ fi
 %doc AUTHORS COPYING* ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Mon Mar 24 2014 Pavel Raiskup <praiskup@redhat.com> - 2.69-4.117.1717
+- require the SCL-ized m4
+
 * Fri Mar 21 2014 Pavel Raiskup <praiskup@redhat.com> - 2.69-3.117.1717
 - build require %%scl_runtime properly