summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Raiskup <praiskup@redhat.com>2017-02-17 18:05:01 +0100
committerPavel Raiskup <praiskup@redhat.com>2017-02-17 18:05:01 +0100
commit2c3ee8b7dc426939092305a60a942c6fd4c18f0a (patch)
tree78df4aeb1437f134ef0bd03e405b279be0356bd1
parent71b5e76f3acc04410f49f0eb6b1bbb2f33edd744 (diff)
downloadscl-autotools-2c3ee8b7dc426939092305a60a942c6fd4c18f0a.tar.gz
scl-autotools-2c3ee8b7dc426939092305a60a942c6fd4c18f0a.tar.xz
scl-autotools-2c3ee8b7dc426939092305a60a942c6fd4c18f0a.zip
latest-libtool: sync gcc hack with fedora
-rw-r--r--repos/autotools/autotools-git/libtool/libtool.spec5
-rw-r--r--repos/autotools/autotools-latest/libtool/libtool.spec17
2 files changed, 18 insertions, 4 deletions
diff --git a/repos/autotools/autotools-git/libtool/libtool.spec b/repos/autotools/autotools-git/libtool/libtool.spec
index 880d3ef..74bda9f 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: 1.%{git_hash}%{?dist}
+Release: 2.%{git_hash}%{?dist}
License: GPLv2+ and LGPLv2+ and GFDL
URL: http://www.gnu.org/software/libtool/
Group: Development/Tools
@@ -201,6 +201,9 @@ fi
%changelog
+* Fri Feb 17 2017 Pavel Raiskup <praiskup@redhat.com> - 2.4.6.35~git-2.f003
+- bump for gcc 7 in F26
+
* Tue Feb 14 2017 Pavel Raiskup <praiskup@redhat.com> - 2.4.6.35~git-1.08c5
- rebase to latest git version
diff --git a/repos/autotools/autotools-latest/libtool/libtool.spec b/repos/autotools/autotools-latest/libtool/libtool.spec
index 041cf0c..7ee6793 100644
--- a/repos/autotools/autotools-latest/libtool/libtool.spec
+++ b/repos/autotools/autotools-latest/libtool/libtool.spec
@@ -8,7 +8,7 @@
%undefine _hardened_build
# See the bug #429880
-%global gcc_version %(gcc -dumpversion || echo "666")
+%global gcc_major %(gcc -dumpversion || echo "666")
%{?scl:%scl_package libtool}
@@ -18,7 +18,7 @@
Summary: The GNU Portable Library Tool
Name: %{?scl_prefix}libtool
Version: 2.4.6
-Release: 3%{?dist}
+Release: 6%{?dist}
License: GPLv2+ and LGPLv2+ and GFDL
URL: http://www.gnu.org/software/libtool/
Group: Development/Tools
@@ -34,7 +34,9 @@ Patch2: libtool-2.4.6-autoreconf.patch
# /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
@@ -205,6 +207,15 @@ fi
%changelog
+* Fri Feb 17 2017 Pavel Raiskup <praiskup@redhat.com> - 2.4.6-5
+- bump for gcc 7 in F26
+
+* Fri Feb 17 2017 Pavel Raiskup <praiskup@redhat.com> - 2.4.6-5
+- bump for gcc 7 in F26
+
+* Sat Dec 31 2016 Pavel Raiskup <praiskup@redhat.com> - 2.4.6-4
+- bump: gcc 6.3.X
+
* Mon Oct 10 2016 Pavel Raiskup <praiskup@redhat.com> - 2.4.6-3
- bump: rebuild october 2016