diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2017-04-18 17:04:57 +0200 |
|---|---|---|
| committer | Pavel Raiskup <praiskup@redhat.com> | 2017-04-18 17:04:57 +0200 |
| commit | 01624471167c984697572b3681303a2d767a21d8 (patch) | |
| tree | 3573578354659dfd20e9f0842cd45d807d3d33dc /repos | |
| parent | 01bea68485db5eb67559ef226878268d57e3e4f8 (diff) | |
| download | scl-autotools-01624471167c984697572b3681303a2d767a21d8.tar.gz scl-autotools-01624471167c984697572b3681303a2d767a21d8.tar.xz scl-autotools-01624471167c984697572b3681303a2d767a21d8.zip | |
libtool: partly revert 2c3ee8b7d for fedora <= 25
Diffstat (limited to 'repos')
| -rw-r--r-- | repos/autotools/autotools-git/libtool/libtool.spec | 9 | ||||
| -rw-r--r-- | repos/autotools/autotools-latest/libtool/libtool.spec | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/repos/autotools/autotools-git/libtool/libtool.spec b/repos/autotools/autotools-git/libtool/libtool.spec index 74bda9f..b76db58 100644 --- a/repos/autotools/autotools-git/libtool/libtool.spec +++ b/repos/autotools/autotools-git/libtool/libtool.spec @@ -21,7 +21,7 @@ Summary: The GNU Portable Library Tool Name: %{?scl_prefix}libtool Version: %{upstream_vr}~git -Release: 2.%{git_hash}%{?dist} +Release: 3.%{git_hash}%{?dist} License: GPLv2+ and LGPLv2+ and GFDL URL: http://www.gnu.org/software/libtool/ Group: Development/Tools @@ -32,7 +32,11 @@ Source: libtool-%{upstream_vr}-%{git_hash}.tar.gz # Libtool must be rebuilt whenever a new upstream gcc is built # Starting with gcc 7 gcc in Fedora is packaged so that only major # number changes need libtool rebuilding. +%if 0%(echo %gcc_major | sed 's|\..*||g') > 6 Requires: gcc(major) = %{gcc_major} +%else +Requires: gcc = %{gcc_major} +%endif Requires: %{?scl_prefix}autoconf, %{?scl_prefix}automake, sed, tar, findutils Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -201,6 +205,9 @@ fi %changelog +* Tue Apr 18 2017 Pavel Raiskup <praiskup@redhat.com> - 2.4.6.35~git-3.f003 +- revert gcc_major fix for Fedora <= 25 + * Fri Feb 17 2017 Pavel Raiskup <praiskup@redhat.com> - 2.4.6.35~git-2.f003 - bump for gcc 7 in F26 diff --git a/repos/autotools/autotools-latest/libtool/libtool.spec b/repos/autotools/autotools-latest/libtool/libtool.spec index 7ee6793..83dbe3d 100644 --- a/repos/autotools/autotools-latest/libtool/libtool.spec +++ b/repos/autotools/autotools-latest/libtool/libtool.spec @@ -18,7 +18,7 @@ Summary: The GNU Portable Library Tool Name: %{?scl_prefix}libtool Version: 2.4.6 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ and LGPLv2+ and GFDL URL: http://www.gnu.org/software/libtool/ Group: Development/Tools @@ -36,7 +36,11 @@ Patch2: libtool-2.4.6-autoreconf.patch # Libtool must be rebuilt whenever a new upstream gcc is built # Starting with gcc 7 gcc in Fedora is packaged so that only major # number changes need libtool rebuilding. +%if 0%(echo %gcc_major | sed 's|\..*||g') > 6 Requires: gcc(major) = %{gcc_major} +%else +Requires: gcc = %{gcc_major} +%endif Requires: %{scl_prefix}autoconf, %{scl_prefix}automake, sed, tar, findutils Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -207,6 +211,9 @@ fi %changelog +* Tue Apr 18 2017 Pavel Raiskup <praiskup@redhat.com> - 2.4.6-7 +- revert gcc_major fix for Fedora <= 25 + * Fri Feb 17 2017 Pavel Raiskup <praiskup@redhat.com> - 2.4.6-5 - bump for gcc 7 in F26 |