diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2014-06-15 11:09:16 +0200 |
|---|---|---|
| committer | Pavel Raiskup <praiskup@redhat.com> | 2014-06-15 11:10:19 +0200 |
| commit | 382a13380940d33ea9e70565829c191d033a495b (patch) | |
| tree | 17c32078948c626a1b254075778f9137dd79abbd | |
| parent | 7582039a1590c1b90b8947d160a65137e897896d (diff) | |
| download | scl-autotools-382a13380940d33ea9e70565829c191d033a495b.tar.gz scl-autotools-382a13380940d33ea9e70565829c191d033a495b.tar.xz scl-autotools-382a13380940d33ea9e70565829c191d033a495b.zip | |
automake-git: fix BR for testsuite
| -rw-r--r-- | repos/autotools/autotools-git/automake/automake.spec | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/repos/autotools/autotools-git/automake/automake.spec b/repos/autotools/autotools-git/automake/automake.spec index f74b843..e2d21e9 100644 --- a/repos/autotools/autotools-git/automake/automake.spec +++ b/repos/autotools/autotools-git/automake/automake.spec @@ -18,7 +18,7 @@ Summary: A GNU tool for automatically creating Makefiles Name: %{?scl_prefix}automake Version: %{api_version}a -Release: 8.%git_tag%{?dist} +Release: 9.%git_tag%{?dist} # docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT License: GPLv2+ and GFDL and Public Domain and MIT @@ -70,7 +70,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} @@ -83,8 +86,11 @@ BuildRequires: dejagnu expect emacs imake python-docutils vala BuildRequires: cscope ncompress sharutils help2man BuildRequires: gcc-objc gcc-objc++ %if !0%{?rhel:1} -# gcc-java was disabled in RHEL >= 7 -BuildRequires: gcc-java python-virtualenv lzip +BuildRequires: python-virtualenv lzip +%if 0%{?fedora} < 21 +# gcc-java was disabled in RHEL >= 7 and Fedora >= 21 +BuildRequires: gcc-java +%endif %endif %endif @@ -171,8 +177,9 @@ fi %{_mandir}/man1/* %changelog -* Sun Jun 15 2014 Pavel Raiskup <praiskup@redhat.com> - 1.99a-8.904253 +* Sun Jun 15 2014 Pavel Raiskup <praiskup@redhat.com> - 1.99a-9.904253 - enable testsuite (don't fail though) +- fix BuildRequires for testsuite * Thu May 29 2014 Pavel Raiskup <praiskup@redhat.com> - 1.99a-7.904253 - release bump for %%_compat_el5_build |