diff options
| author | B Stack <bgstack15@gmail.com> | 2020-09-16 23:08:21 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-09-16 23:08:21 +0000 |
| commit | 36ef6fd4f38428329d0adbba325e403efc1552c5 (patch) | |
| tree | 2e95be9c1a86bc2ba47491a50045bfdf3bbca290 /waterfox/waterfox.spec | |
| parent | Merge branch 'freefilesync-bump' into 'master' (diff) | |
| parent | system_sqlite=0 for el8 (diff) | |
| download | stackrpms-36ef6fd4f38428329d0adbba325e403efc1552c5.tar.gz stackrpms-36ef6fd4f38428329d0adbba325e403efc1552c5.tar.bz2 stackrpms-36ef6fd4f38428329d0adbba325e403efc1552c5.zip | |
Merge branch 'waterfox-bump' into 'master'
Waterfox 2020.08
See merge request bgstack15/stackrpms!186
Diffstat (limited to 'waterfox/waterfox.spec')
| -rw-r--r-- | waterfox/waterfox.spec | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index e3444f4..3b3e5af 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -153,10 +153,14 @@ BuildRequires: %{scl_buildreq} %if 0%{?rhel} >= 7 %global system_webp 0 %endif +# added for 2020.08 because right now el8 does not have sqlite >= 3.30.1 +%if 0%{?rhel} == 8 +%global system_sqlite 0 +%endif Summary: Waterfox Web browser Name: waterfox -Version: 2020.07.2 +Version: 2020.08 Release: 11%{?branch:.%{branch}}%{?gver}%{?dist} URL: https://www.waterfox.net License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -221,6 +225,7 @@ Patch420: https://hg.mozilla.org/mozilla-central/raw-rev/97dae871389b#/mo # Upstream updates/PRs/Reverts #Patch???: %%{vc_url}/commit/commit.patch#/%%{name}-gh-commit.patch +Patch450: %{vc_url}/commit/26459c47f867dc1882fa7b87e32a9e8fc5e125e5.patch#/%{name}-gh-26459c4.patch # Debian patches Patch500: mozilla-440908.patch @@ -425,6 +430,8 @@ This package contains results of tests executed during build. %patch419 -p1 -b .mozilla-1320560 %patch420 -p1 -b .mozilla-1389436 +%patch450 -p1 -b .gh26459c4 -R + # Debian extension patch %patch500 -p1 -b .440908 @@ -457,9 +464,9 @@ done # 3: no apply # 4: uncertain for i in \ - 702179 991253 1021761 1144632 1288587 1379148 1393235 1393283 1393627 1395486 1396722 \ + 702179 730495 991253 1021761 1144632 1288587 1379148 1393235 1393283 1393627 1395486 1396722 \ 1401909 1419762 1427126 1430508 1433747 1452576 1453127 1454285 1455235 1466606 1469257 \ - 1384121 1384701 1388744 1401063 1413143 1415883 1402442 1437450 \ + 1384121 1384701 1388744 1401063 1406396 1413143 1415883 1402442 1437450 \ 1447519 do rm -f _patches/patch-bug${i} @@ -1082,11 +1089,14 @@ fi #--------------------------------------------------------------------- %changelog -* Tue Aug 11 2020 B Stack <bgstack15@gmail.com> - 2020.07.2-11.classic +* Wed Aug 26 2020 B Stack <bgstack15@gmail.com> - 2020.08-11.classic - add el7 and el8 support - repackage for stackrpms - disable simd globally +* Tue Aug 25 2020 Phantom X <megaphantomx at hotmail dot com> - 2020.08-1.classic +- 2020.08 + * Wed Aug 05 2020 Phantom X <megaphantomx at hotmail dot com> - 2020.07.2-1.classic - 2020.07.2 |