From d0808eae29d7c4220613416d688756160a80e356 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Oct 10 2013 10:14:09 +0000 Subject: rebase: new _MINOR_ version update to 1.14 First step - autoreconf (and testsuite adjustment) may be done once automake-1.14 is in buildroot. Resolves: #976973 Version: 1.14-1 --- diff --git a/.gitignore b/.gitignore index 341e308..32f1910 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ automake-1.11.1.tar.bz2 /automake-1.13.1.tar.xz /automake-1.13.2.tar.xz /automake-1.13.4.tar.xz +/automake-1.14.tar.xz diff --git a/automake.spec b/automake.spec index 9e8913c..2882a45 100644 --- a/automake.spec +++ b/automake.spec @@ -1,9 +1,12 @@ -%global api_version 1.13 +%global api_version 1.14 + +# remove once %%configure is used instead of ./configure +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Summary: A GNU tool for automatically creating Makefiles Name: automake -Version: %{api_version}.4 -Release: 6%{?dist} +Version: %{api_version} +Release: 1%{?dist} # docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT License: GPLv2+ and GFDL and Public Domain and MIT @@ -37,7 +40,7 @@ Requires(preun): /sbin/install-info BuildArch: noarch # run "make check" by default -%bcond_without check +%bcond_with check # for better tests coverage: %if %{with check} @@ -71,18 +74,18 @@ Makefiles. %prep %setup -q -n automake-%{version} -%patch0 -p1 -b .disable_tests -%patch1 -p1 -b .hash_order -autoreconf -iv +# %patch0 -p1 -b .disable_tests +# %patch1 -p1 -b .hash_order +# autoreconf -iv # Fedora only to add ppc64p7 (Power7 optimized) arch: perl -pi -e "s/ppc64-\*/ppc64-\* \| ppc64p7-\*/" lib/config.sub %build -# TODO: use %configure once #991613 +# TODO: use %%configure once #991613 ./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \ --bindir=%{_bindir} --datadir=%{_datadir} --libdir=%{_libdir} \ - --docdir=%{_docdir}/%{name} --disable-silent-rules + --docdir=%{_pkgdocdir} --disable-silent-rules make V=0 %{?_smp_mflags} cp m4/acdir/README README.aclocal cp contrib/multilib/README README.multilib @@ -114,6 +117,9 @@ fi %{_mandir}/man1/* %changelog +* Wed Oct 09 2013 Pavel Raiskup - 1.14-1 +- rebase to automake-1.14, first step (without testsuite) (#976973) + * Thu Aug 22 2013 Pavel Raiskup - 1.13.4-6 - don't require /usr/bin/g77 (#994910) diff --git a/sources b/sources index c4a54d4..4465d9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -71b03c1bc4f587add12604587d9276d1 automake-1.13.4.tar.xz +cb3fba6d631cddf12e230fd0cc1890df automake-1.14.tar.xz