From cdfaccc95c7c1d747a081ae733b5c79a93b47958 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 14 Feb 2017 16:59:56 +0100 Subject: git/libtool: sync with fedora #2 --- repos/autotools/autotools-git/libtool/libtool.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/repos/autotools/autotools-git/libtool/libtool.spec b/repos/autotools/autotools-git/libtool/libtool.spec index b6933a5..dbb63e8 100644 --- a/repos/autotools/autotools-git/libtool/libtool.spec +++ b/repos/autotools/autotools-git/libtool/libtool.spec @@ -14,14 +14,14 @@ %{?scl:%scl_package libtool} # See the bug #429880 -%global gcc_version %(gcc -dumpversion || echo "666") +%global gcc_major %(gcc -dumpversion || echo "666") %bcond_with check Summary: The GNU Portable Library Tool Name: %{?scl_prefix}libtool Version: %{upstream_vr}~git -Release: 5.%{git_hash}%{?dist} +Release: 6.%{git_hash}%{?dist} License: GPLv2+ and LGPLv2+ and GFDL URL: http://www.gnu.org/software/libtool/ Group: Development/Tools @@ -30,7 +30,9 @@ Source: libtool-%{upstream_vr}-%{git_hash}.tar.gz # /usr/bin/libtool includes paths within gcc's versioned directories # Libtool must be rebuilt whenever a new upstream gcc is built -Requires: gcc = %{gcc_version} +# Starting with gcc 7 gcc in Fedora is packaged so that only major +# number changes need libtool rebuilding. +Requires: gcc(major) = %{gcc_major} Requires: %{?scl_prefix}autoconf, %{?scl_prefix}automake, sed, tar, findutils Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -199,6 +201,9 @@ fi %changelog +* Tue Feb 14 2017 Pavel Raiskup - 2.4.6.34~git-6.08c5 +- sync with fedora + * Tue Jan 03 2017 Pavel Raiskup - 2.4.6.34~git-5.08c5 - sync with fedora -- cgit