summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2022-02-10 15:00:42 -0500
committerB. Stack <bgstack15@gmail.com>2022-02-10 15:00:42 -0500
commit7d74fda24b9d127df7a76864bdadeb53dc52efe5 (patch)
tree21e78a92e7517964244dcda951b2c211373d64df
parentwf 2022.01 rc1 (diff)
downloadstackrpms-7d74fda24b9d127df7a76864bdadeb53dc52efe5.tar.gz
stackrpms-7d74fda24b9d127df7a76864bdadeb53dc52efe5.tar.bz2
stackrpms-7d74fda24b9d127df7a76864bdadeb53dc52efe5.zip
fix spec
-rw-r--r--waterfox/waterfox.spec22
1 files changed, 9 insertions, 13 deletions
diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec
index 621a924..096cf5b 100644
--- a/waterfox/waterfox.spec
+++ b/waterfox/waterfox.spec
@@ -166,12 +166,12 @@ BuildRequires: %{scl_buildreq}
Summary: Waterfox %{channel} Web browser
Name: waterfox
-Version: 2021.11
+Version: 2022.01
Release: 11%{?branch:.%{branch}}%{?gver}%{?dist}
URL: https://classic.waterfox.net
License: MPLv1.1 or GPLv2+ or LGPLv2+
-%global vc_url https://github.com/WaterfoxCo/Waterfox
+%global vc_url https://github.com/WaterfoxCo/Waterfox-%{channel}
%if 0%{?with_snapshot}
Source0: %{vc_url}/archive/%{commit}/%{name}-%{channel}-%{shortcommit}.tar.gz
%else
@@ -182,10 +182,7 @@ Source0: %{vc_url}/archive/%{version}-%{branch}/%{name}-%{branch}-%{versi
# https://www.freshports.org/www/waterfox
# rev=revision ./waterfox-FreeBSD-patches-snapshot.sh
# https://github.com/WaterfoxCo/Waterfox/issues/1220
-# stackrpms, 4
-# for revision freebsd_rev 20191102 we need to use somewhere else because the dl.bintray.com file is not available to me
-# found in builder-live.log.gz from chinfo copr waterfox build
-Source600: https://copr-dist-git.fedorainfracloud.org/repo/pkgs/phantomx/chinforpms/waterfox/%{freebsd_root}.tar.xz/e28455f630158a06d82cad5662d3f9b9/%{freebsd_root}.tar.xz
+Source600: https://copr-dist-git.fedorainfracloud.org/repo/pkgs/phantomx/chinforpms/%{name}/%{freebsd_root}.tar.xz/e28455f630158a06d82cad5662d3f9b9/%{freebsd_root}.tar.xz
Source601: patch-bug1321069
Source602: patch-bug1381815
@@ -401,11 +398,7 @@ This package contains results of tests executed during build.
#---------------------------------------------------------------------
%prep
-%if 0%{?with_snapshot}
-%setup -q -n Waterfox-%{channel}-%{commit} -a 600
-%else
-%setup -q -n Waterfox-%{channel}-%{version}-%{branch} -a 600
-%endif
+%autosetup -n Waterfox-%{channel}-%{?gver:%{commit}}%{!?gver:%{version}-%{branch}} -N -a 600
%if %{build_langpacks}
mkdir waterfox-langpacks
@@ -736,7 +729,7 @@ echo "ac_add_options --enable-linker=gold" >> .mozconfig
MOZ_OPT_FLAGS="-fuse-ld=gold"
%endif
%endif
-# stackrpms,5
+# stackrpms,5 for el7,8 that lacks nasm 2.13 for av1
%if 0%{?disable_av1}
echo "ac_add_options --disable-av1" >> .mozconfig
@@ -1125,11 +1118,14 @@ fi
#---------------------------------------------------------------------
%changelog
-* Mon Nov 29 2021 B. Stack <bgstack15@gmail.com> - 2021.11-11.classic
+* Thu Feb 10 2022 B. Stack <bgstack15@gmail.com> - 2022.01-11.classic
- add el7 and el8 support
- repackage for stackrpms
- disable simd globally
+* Thu Jan 20 2022 Phantom X <megaphantomx at hotmail dot com> - 2022.01-1.classic
+- 2022.01
+
* Fri Nov 19 2021 Phantom X <megaphantomx at hotmail dot com> - 2021.11-1.classic
- 2021.11
- Update URLs to new Classic repository
bgstack15