From a025d499d4cc21ec0dfbb96bc4a32c2f90e76369 Mon Sep 17 00:00:00 2001 From: B Stack Date: Fri, 23 Apr 2021 09:27:30 -0400 Subject: wf 2020.04 rc1 --- waterfox/waterfox.spec | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'waterfox/waterfox.spec') diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index f0ff9ad..80a0d35 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -1,9 +1,9 @@ %global _legacy_common_support 1 -%global commit d5de4ec99d1d61a309d7fcd96da12488c9afe550 +%global commit 93fc15e9f2d68d8a43b22c57b8b935f272ce06eb %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global date 20200408 -%global with_snapshot 0 +%global date 20200422 +%global with_snapshot 1 %global branch classic @@ -166,7 +166,7 @@ BuildRequires: %{scl_buildreq} Summary: Waterfox Web browser Name: waterfox -Version: 2021.03 +Version: 2021.04.1 Release: 11%{?branch:.%{branch}}%{?gver}%{?dist} URL: https://www.waterfox.net License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -175,7 +175,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?with_snapshot} Source0: %{vc_url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz %else -Source0: %{vc_url}/archive/%{version}-%{branch}/%{name}-%{version}-%{branch}.tar.gz +Source0: %{vc_url}/archive/%{version}/%{name}-%{version}-%{branch}.tar.gz %endif # FreeBSD patches @@ -241,7 +241,6 @@ Patch601: mozilla-1516081.patch Patch602: mozilla-1516803.patch Patch603: mozilla-1397365-5.patch Patch604: 1003_gentoo_specific_pgo.patch -Patch605: https://hg.mozilla.org/mozilla-central/raw-rev/c999baadc2d5#/mozilla-hg-1433383.patch # Chinforinfula patches Patch700: %{name}-nolangpacks.patch @@ -251,7 +250,6 @@ Patch702: %{name}-waterfoxdir-2.patch Patch703: %{name}-fix-testing-file.patch Patch704: %{name}-disable-diagnostics-color.patch Patch705: 0001-Update-patch-bug1403998.patch -Patch706: 0001-angle-set-c-14.patch # Gentoo Patch800: seamonkey-2.53.3-system_libvpx-1.8.patch @@ -457,7 +455,6 @@ This package contains results of tests executed during build. %patch602 -p1 -b .1516803 %patch603 -p1 -b .1397365 %patch604 -p1 -b .gentoo_pgo -%patch605 -p1 -b .1433383 # Prepare FreeBSD patches mkdir _patches @@ -505,7 +502,6 @@ done %patch702 -p1 -b .waterfoxdir-2 %patch703 -p1 -b .fix-testing-file %patch704 -p1 -b .no-diagnostics-color -%patch706 -p1 -b .angle-c++14 # stackrpms,2 %if 0%{?system_libvpx} @@ -1073,7 +1069,8 @@ fi %{mozappdir}/browser/defaults/preferences/*.js # stackrpms,2 %if 0%{?rhel} != 7 -%ghost %{mozappdir}/browser/features/*.xpi +%dir %{mozappdir}/browser/features +#{mozappdir}/browser/features/*.xpi # stackrpms,2 %endif %{mozappdir}/distribution/distribution.ini @@ -1115,11 +1112,14 @@ fi #--------------------------------------------------------------------- %changelog -* Tue Apr 13 2021 B. Stack - 2021.03-11.classic +* Fri Apr 23 2021 B. Stack - 2021.04.1-11.classic - add el7 and el8 support - repackage for stackrpms - disable simd globally +* Thu Apr 22 2021 Phantom X - 2021.04.1-1.classic.20200422git93fc15e +- 2021.04.1 + * Thu Apr 08 2021 Phantom X - 2021.03-1.classic - 2021.03 - BR: nasm -- cgit From 6c549b34fbc0208647a2f2f2cdab551b66f05621 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Tue, 27 Apr 2021 14:37:48 -0400 Subject: wf 2020.04.2 --- waterfox/waterfox.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'waterfox/waterfox.spec') diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index 80a0d35..555837b 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -3,7 +3,7 @@ %global commit 93fc15e9f2d68d8a43b22c57b8b935f272ce06eb %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global date 20200422 -%global with_snapshot 1 +%global with_snapshot 0 %global branch classic @@ -166,7 +166,7 @@ BuildRequires: %{scl_buildreq} Summary: Waterfox Web browser Name: waterfox -Version: 2021.04.1 +Version: 2021.04.2 Release: 11%{?branch:.%{branch}}%{?gver}%{?dist} URL: https://www.waterfox.net License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -396,7 +396,7 @@ This package contains results of tests executed during build. %if 0%{?with_snapshot} %setup -q -n Waterfox-%{commit} -a 600 %else -%setup -q -n Waterfox-%{version}-%{branch} -a 600 +%setup -q -n Waterfox-%{version} -a 600 %endif %if %{build_langpacks} @@ -1074,8 +1074,6 @@ fi # stackrpms,2 %endif %{mozappdir}/distribution/distribution.ini -# That's Windows only -%ghost %{mozappdir}/browser/features/aushelper@mozilla.org.xpi %attr(644, root, root) %{mozappdir}/browser/blocklist.xml %attr(644, root, root) %{mozappdir}/browser/ua-update.json %dir %{mozappdir}/browser/extensions @@ -1112,11 +1110,14 @@ fi #--------------------------------------------------------------------- %changelog -* Fri Apr 23 2021 B. Stack - 2021.04.1-11.classic +* Tue Apr 27 2021 B. Stack - 2021.04.2-11.classic - add el7 and el8 support - repackage for stackrpms - disable simd globally +* Mon Apr 26 2021 Phantom X - 2021.04.2-1.classic +- 2021.04.2 + * Thu Apr 22 2021 Phantom X - 2021.04.1-1.classic.20200422git93fc15e - 2021.04.1 -- cgit