summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Raiskup <praiskup@redhat.com>2015-08-12 17:28:50 +0200
committerPavel Raiskup <praiskup@redhat.com>2015-08-12 17:28:50 +0200
commit34ecf9ca32bf68cd0f972ee6e549e080dd44889a (patch)
tree71694854c072af35e983c1b0a112dba3b2313324
parentd838608537cf70e3cec2c2b9196f1ac39b56228e (diff)
downloadscl-autotools-34ecf9ca32bf68cd0f972ee6e549e080dd44889a.tar.gz
scl-autotools-34ecf9ca32bf68cd0f972ee6e549e080dd44889a.tar.xz
scl-autotools-34ecf9ca32bf68cd0f972ee6e549e080dd44889a.zip
latest/automake: apply one patch I missed before
-rw-r--r--repos/autotools/autotools-latest/automake/automake.spec13
1 files changed, 9 insertions, 4 deletions
diff --git a/repos/autotools/autotools-latest/automake/automake.spec b/repos/autotools/autotools-latest/automake/automake.spec
index d785e65..40d9302 100644
--- a/repos/autotools/autotools-latest/automake/automake.spec
+++ b/repos/autotools/autotools-latest/automake/automake.spec
@@ -1,7 +1,6 @@
%{?_compat_el5_build}
# Workaround to always have %%scl defined (for testing locally)
-
%{!?scl:%global scl autotools-latest}
%{?scl:%scl_package automake}
@@ -14,7 +13,7 @@
Summary: A GNU tool for automatically creating Makefiles
Name: %{?scl_prefix}automake
Version: %{api_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
# docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
License: GPLv2+ and GFDL and Public Domain and MIT
@@ -52,7 +51,10 @@ BuildRequires: %{scl_prefix}autoconf
# for better tests coverage:
%if %{with check}
#TODO: add libtool from SCL
-BuildRequires: gettext-devel flex bison texinfo-tex texlive-dvips
+BuildRequires: gettext-devel flex bison texinfo-tex
+%if 0%{?rhel} != 5
+BuildRequires: texlive-dvips
+%endif
BuildRequires: java-devel-openjdk gcc-gfortran
# /usr/bin/g77 is not in RHEL7
%if !0%{?rhel}
@@ -101,6 +103,7 @@ Makefiles.
%prep
%setup -q -n automake-%{version}
%patch0 -p1 -b .disable_tests
+%patch1 -p1 -b .curly_bracket
# to use this, we should 100% *know* what the patches do
find -exec touch --date=`date -I` {} +
@@ -118,7 +121,6 @@ perl -pi -e "s/ppc64-\*/ppc64-\* \| ppc64p7-\*/" lib/config.sub
# disable replacing config.guess and config.sub from redhat-rpm-config
%global _configure_gnuconfig_hack 0
scl enable autotools-latest - <<\EOF
-set -x
%configure --docdir=%{_pkgdocdir}
make %{?_smp_mflags}
EOF
@@ -177,6 +179,9 @@ fi
%{_mandir}/man1/*
%changelog
+* Wed Aug 12 2015 Pavel Raiskup <praiskup@redhat.com> - 1.15-4
+- apply the "curly bracket" patch
+
* Wed Aug 12 2015 Pavel Raiskup <praiskup@redhat.com> - 1.15-3
- sync with Fedora 24 (rawhide) spec file