%make_* macros, BR split to separate lines

Version: 1.16.1-8
This commit is contained in:
Pavel Raiskup 2018-10-12 10:57:43 +02:00
parent 21b7b3f480
commit 85bd994a00
1 changed files with 25 additions and 11 deletions

View File

@ -11,7 +11,7 @@
Summary: A GNU tool for automatically creating Makefiles
Name: automake
Version: %{api_version}.1
Release: 7%{?dist}
Release: 8%{?dist}
# docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> 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
# Keep those patches in 'git format-patch' format (with docs).
%if %{with check} && !%{without automake_enables_optional_test}
Patch0: automake-1.15-disable-vala-tests.patch
%endif
@ -49,14 +47,27 @@ BuildArch: noarch
# for better tests coverage:
%if %{with check}
%if %{with automake_enables_optional_test}
BuildRequires: automake libtool gettext-devel flex bison texinfo-tex texlive-dvips
BuildRequires: java-devel-openjdk gcc-gfortran
BuildRequires: dejagnu expect emacs vala
BuildRequires: cscope ncompress sharutils
BuildRequires: automake
BuildRequires: bison
BuildRequires: cscope
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}
BuildRequires: lzip
BuildRequires: gcc-objc gcc-objc++
BuildRequires: gcc-objc
BuildRequires: gcc-objc++
BuildRequires: imake
BuildRequires: lzip
%endif
%endif
%endif
@ -91,13 +102,13 @@ done
# disable replacing config.guess and config.sub from redhat-rpm-config
%global _configure_gnuconfig_hack 0
%configure
make %{?_smp_mflags}
%make_build
cp m4/acdir/README README.aclocal
cp contrib/multilib/README README.multilib
%install
make install DESTDIR=%{buildroot}
%make_install
%check
@ -122,6 +133,9 @@ make -k %{?_smp_mflags} check %{?TESTS_FLAGS: TESTS="%{TESTS_FLAGS}"} \
%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
- update config.{guess,sub} to gnuconfig git HEAD