%make_* macros, BR split to separate lines
Version: 1.16.1-8
This commit is contained in:
parent
21b7b3f480
commit
85bd994a00
|
@ -11,7 +11,7 @@
|
||||||
Summary: A GNU tool for automatically creating Makefiles
|
Summary: A GNU tool for automatically creating Makefiles
|
||||||
Name: automake
|
Name: automake
|
||||||
Version: %{api_version}.1
|
Version: %{api_version}.1
|
||||||
Release: 7%{?dist}
|
Release: 8%{?dist}
|
||||||
|
|
||||||
# docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
|
# docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
|
||||||
License: GPLv2+ and GFDL and Public Domain and MIT
|
License: GPLv2+ and GFDL and Public Domain and MIT
|
||||||
|
@ -21,8 +21,6 @@ Source2: http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
|
||||||
Source3: http://git.savannah.gnu.org/cgit/config.git/plain/config.guess
|
Source3: http://git.savannah.gnu.org/cgit/config.git/plain/config.guess
|
||||||
|
|
||||||
# Keep those patches in 'git format-patch' format (with docs).
|
# Keep those patches in 'git format-patch' format (with docs).
|
||||||
|
|
||||||
|
|
||||||
%if %{with check} && !%{without automake_enables_optional_test}
|
%if %{with check} && !%{without automake_enables_optional_test}
|
||||||
Patch0: automake-1.15-disable-vala-tests.patch
|
Patch0: automake-1.15-disable-vala-tests.patch
|
||||||
%endif
|
%endif
|
||||||
|
@ -49,14 +47,27 @@ BuildArch: noarch
|
||||||
# for better tests coverage:
|
# for better tests coverage:
|
||||||
%if %{with check}
|
%if %{with check}
|
||||||
%if %{with automake_enables_optional_test}
|
%if %{with automake_enables_optional_test}
|
||||||
BuildRequires: automake libtool gettext-devel flex bison texinfo-tex texlive-dvips
|
BuildRequires: automake
|
||||||
BuildRequires: java-devel-openjdk gcc-gfortran
|
BuildRequires: bison
|
||||||
BuildRequires: dejagnu expect emacs vala
|
BuildRequires: cscope
|
||||||
BuildRequires: cscope ncompress sharutils
|
BuildRequires: dejagnu
|
||||||
|
BuildRequires: emacs
|
||||||
|
BuildRequires: expect
|
||||||
|
BuildRequires: flex
|
||||||
|
BuildRequires: gcc-gfortran
|
||||||
|
BuildRequires: gettext-devel
|
||||||
|
BuildRequires: java-devel-openjdk
|
||||||
|
BuildRequires: libtool
|
||||||
|
BuildRequires: ncompress
|
||||||
|
BuildRequires: sharutils
|
||||||
|
BuildREquires: texlive-dvips
|
||||||
|
BuildRequires: texinfo-tex
|
||||||
|
BuildRequires: vala
|
||||||
%if !0%{?rhel:1}
|
%if !0%{?rhel:1}
|
||||||
BuildRequires: lzip
|
BuildRequires: gcc-objc
|
||||||
BuildRequires: gcc-objc gcc-objc++
|
BuildRequires: gcc-objc++
|
||||||
BuildRequires: imake
|
BuildRequires: imake
|
||||||
|
BuildRequires: lzip
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
@ -91,13 +102,13 @@ done
|
||||||
# disable replacing config.guess and config.sub from redhat-rpm-config
|
# disable replacing config.guess and config.sub from redhat-rpm-config
|
||||||
%global _configure_gnuconfig_hack 0
|
%global _configure_gnuconfig_hack 0
|
||||||
%configure
|
%configure
|
||||||
make %{?_smp_mflags}
|
%make_build
|
||||||
cp m4/acdir/README README.aclocal
|
cp m4/acdir/README README.aclocal
|
||||||
cp contrib/multilib/README README.multilib
|
cp contrib/multilib/README README.multilib
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make install DESTDIR=%{buildroot}
|
%make_install
|
||||||
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
|
@ -122,6 +133,9 @@ make -k %{?_smp_mflags} check %{?TESTS_FLAGS: TESTS="%{TESTS_FLAGS}"} \
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Oct 12 2018 Pavel Raiskup <praiskup@redhat.com> - 1.16.1-8
|
||||||
|
- split BR to separate lines, use %%make_* macros
|
||||||
|
|
||||||
* Mon Sep 17 2018 Pavel Raiskup <praiskup@redhat.com> - 1.16.1-7
|
* Mon Sep 17 2018 Pavel Raiskup <praiskup@redhat.com> - 1.16.1-7
|
||||||
- update config.{guess,sub} to gnuconfig git HEAD
|
- update config.{guess,sub} to gnuconfig git HEAD
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue