summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-03-20 21:18:04 +0000
committerB Stack <bgstack15@gmail.com>2020-03-20 21:18:04 +0000
commite3b8f8188b516979b7383d0a8cec6b78bc4b1a12 (patch)
tree2e22eea30d66e00d30ffd4f901ef5532ad4a08dc
parentMerge branch 'keyboard-leds-trayicons-bump' into 'master' (diff)
parentadd gcc10 fix (diff)
downloadstackrpms-e3b8f8188b516979b7383d0a8cec6b78bc4b1a12.tar.gz
stackrpms-e3b8f8188b516979b7383d0a8cec6b78bc4b1a12.tar.bz2
stackrpms-e3b8f8188b516979b7383d0a8cec6b78bc4b1a12.zip
Merge branch 'waterfox-bump' into 'master'
waterfox: add gcc10 fix See merge request bgstack15/stackrpms!143
-rw-r--r--waterfox/README.md3
-rw-r--r--waterfox/waterfox.spec9
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 <bgstack15@gmail.com> - 2020.02.1-11.classic.20200313gitf6fe91c
+* Thu Mar 19 2020 B Stack <bgstack15@gmail.com> - 2020.02.1-12.classic.20200313gitf6fe91c
- add el7 and el8 support
- repackage for stackrpms
- disable simd globally
+* Wed Mar 18 2020 Phantom X <megaphantomx at bol dot com dot br> - 2020.03.1-2.classic.20200313gitf6fe91c
+- gcc 10 fix
+
* Fri Mar 13 2020 Phantom X <megaphantomx at bol dot com dot br> - 2020.03.1-2.classic.20200313gitf6fe91c
- 2020.03.1
bgstack15