From 2f48465d696346b825028d58861ef53633f8ee35 Mon Sep 17 00:00:00 2001 From: B Stack Date: Thu, 19 Mar 2020 10:29:53 -0400 Subject: add gcc10 fix --- waterfox/README.md | 3 +++ waterfox/waterfox.spec | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/waterfox/README.md b/waterfox/README.md index 231130e..642c136 100644 --- a/waterfox/README.md +++ b/waterfox/README.md @@ -15,6 +15,9 @@ Distro | Waterfox version ---------- | ---------------- All | 2020.01-classic +# Additional info +* 2020-03-19 [https://src.fedoraproject.org/rpms/redhat-rpm-config/blob/master/f/buildflags.md](https://src.fedoraproject.org/rpms/redhat-rpm-config/blob/master/f/buildflags.md) is where the rpm scriptlet `_legacy_common_support 1` comes from, for telling gcc 10 to use `-fcommon` + # Differences from upstream ## rpm View the output of script [stackrpms-diff.sh](stackrpms-diff.sh) with this command: diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index 9f0ab9f..85db78f 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -1,3 +1,5 @@ +%global _legacy_common_support 1 + %global commit f6fe91ce29333271a5ef97ba148294404d28ab3f %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global date 20200313 @@ -160,7 +162,7 @@ BuildRequires: %{scl_buildreq} Summary: Waterfox Web browser Name: waterfox Version: 2020.03.1 -Release: 11%{?branch:.%{branch}}%{?gver}%{?dist} +Release: 12%{?branch:.%{branch}}%{?gver}%{?dist} URL: https://www.waterfox.net License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -1084,11 +1086,14 @@ fi #--------------------------------------------------------------------- %changelog -* Mon Mar 16 2020 B Stack - 2020.02.1-11.classic.20200313gitf6fe91c +* Thu Mar 19 2020 B Stack - 2020.02.1-12.classic.20200313gitf6fe91c - add el7 and el8 support - repackage for stackrpms - disable simd globally +* Wed Mar 18 2020 Phantom X - 2020.03.1-2.classic.20200313gitf6fe91c +- gcc 10 fix + * Fri Mar 13 2020 Phantom X - 2020.03.1-2.classic.20200313gitf6fe91c - 2020.03.1 -- cgit