summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Raiskup <praiskup@redhat.com>2014-12-19 13:41:49 +0100
committerPavel Raiskup <praiskup@redhat.com>2014-12-19 13:41:49 +0100
commit89d0138db855fdf4bae52810d55205ccf3a6696e (patch)
tree36ea28baf24ae90b07b83f42f1297ec5bacc4da6
parentbef2362681fe8f0284829133ea12d5d0b10bc19b (diff)
autotools-git-libtool: require sufficiently new m4
-rw-r--r--repos/autotools/autotools-git/libtool/libtool.spec12
1 files changed, 11 insertions, 1 deletions
diff --git a/repos/autotools/autotools-git/libtool/libtool.spec b/repos/autotools/autotools-git/libtool/libtool.spec
index 8494bab..489fd24 100644
--- a/repos/autotools/autotools-git/libtool/libtool.spec
+++ b/repos/autotools/autotools-git/libtool/libtool.spec
@@ -13,7 +13,7 @@
Summary: The GNU Portable Library Tool
Name: %{?scl_prefix}libtool
Version: 2.4.5~git
-Release: 1.%{git_hash}%{?dist}
+Release: 2.%{git_hash}%{?dist}
License: GPLv2+ and LGPLv2+ and GFDL
URL: http://www.gnu.org/software/libtool/
Group: Development/Tools
@@ -27,6 +27,11 @@ Requires: %{scl_prefix}autoconf, %{scl_prefix}automake, sed, tar, findutils
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
+# From libtool 2.4.5, m4 is required and because the version of m4 is checked by
+# autoconf code, we need to require the git-version.
+BuildRequires: %{?scl_prefix}m4
+Requires: %{?scl_prefix}m4
+
BuildRequires: texinfo
%{?scl:
@@ -99,6 +104,7 @@ find -exec touch --date=`date -I` {} +
%build
+scl enable autotools-git - <<\EOF
export CC=gcc
export CXX=g++
export F77=gfortran
@@ -119,6 +125,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fPIC"
--host= --build= --target=
make %{?_smp_mflags}
+EOF
%check
@@ -179,6 +186,9 @@ fi
%{_libdir}/libltdl.so
%changelog
+* Fri Dec 19 2014 Pavel Raiskup <praiskup@redhat.com> - 2.4.5~git-2.97f0
+- require the git version of m4
+
* Fri Dec 19 2014 Pavel Raiskup <praiskup@redhat.com> - 2.4.5~git-1.97f0
- rebase: new git HEAD