Merge branch 'waterfox-bump' into 'master'

Waterfox bump

See merge request bgstack15/stackrpms!285

4 files changed, 17 insertions, 16 deletions

diff --git a/waterfox/debian/changelog b/waterfox/debian/changelog
index 42ff38d..3b90e05 100644
--- a/waterfox/debian/changelog
+++ b/waterfox/debian/changelog
@@ -1,3 +1,9 @@
+waterfox (2022.01-1+devuan) obs; urgency=medium
+
+  - latest version
+
+ -- B. Stack <bgstack15@gmail.com>  Thu, 10 Feb 2022 14:47:47 -0500
+
 waterfox (2021.11-1+devuan) obs; urgency=medium
 
   - latest version
diff --git a/waterfox/debian/control b/waterfox/debian/control
index 66f7d79..7df391c 100644
--- a/waterfox/debian/control
+++ b/waterfox/debian/control
@@ -36,7 +36,6 @@ Build-Depends: debhelper (>= 12),
    lsb-release,
    nasm (>= 2.13),
    python2 (>= 2.7.18-2~) | python (>= 2.7),
-   python-ply,
    rustc (>= 1.34),
    unzip,
    xauth,
diff --git a/waterfox/debian/waterfox+devuan.dsc b/waterfox/debian/waterfox+devuan.dsc
index 7c5e67f..f4f0329 100644
--- a/waterfox/debian/waterfox+devuan.dsc
+++ b/waterfox/debian/waterfox+devuan.dsc
@@ -2,11 +2,11 @@ Format: 3.0 (quilt)
 Source: waterfox
 Binary: waterfox
 Architecture: any
-Version: 2021.11-1+devuan
+Version: 2022.01-1+devuan
 Maintainer: B. Stack <bgstack15@gmail.com>
 Homepage: https://www.waterfox.net/
 Standards-Version: 4.1.4
-Build-Depends: debhelper (>= 12), autoconf2.13, autotools-dev, binutils-avr, cargo (>= 0.35), ccache, clang (>= 4.0) | clang-4.0 | clang-6.0 | clang-7, dpkg-dev (>= 1.16.1.1~), libasound2-dev, libbz2-dev, libclang-dev (>= 4.0) | libclang-4.0-dev | libclang-6.0-dev | libclang-7-dev, libdbus-glib-1-dev, libevent-dev (>= 1.4.1), libgconf2-dev, libglib2.0-dev (>= 2.16.0), libgtk2.0-dev (>= 2.10), libgtk-3-dev, libiw-dev, libjpeg-dev, libjsoncpp-dev, libnotify-dev, libreadline-dev, libstartup-notification0-dev, libtinfo-dev, libx11-dev, libx11-xcb-dev, libxt-dev, llvm-dev (>= 4.0) | llvm-4.0-dev | llvm-6.0-dev | llvm-7-dev, locales, lsb-release, nasm (>= 2.13), python2 (>= 2.7.18-2~) | python (>= 2.7), python-ply, rustc (>= 1.34), unzip, xauth, xfonts-base, xvfb, yasm (>= 1.1), zip, zlib1g-dev, libfontconfig-dev
+Build-Depends: debhelper (>= 12), autoconf2.13, autotools-dev, binutils-avr, cargo (>= 0.35), ccache, clang (>= 4.0) | clang-4.0 | clang-6.0 | clang-7, dpkg-dev (>= 1.16.1.1~), libasound2-dev, libbz2-dev, libclang-dev (>= 4.0) | libclang-4.0-dev | libclang-6.0-dev | libclang-7-dev, libdbus-glib-1-dev, libevent-dev (>= 1.4.1), libgconf2-dev, libglib2.0-dev (>= 2.16.0), libgtk2.0-dev (>= 2.10), libgtk-3-dev, libiw-dev, libjpeg-dev, libjsoncpp-dev, libnotify-dev, libreadline-dev, libstartup-notification0-dev, libtinfo-dev, libx11-dev, libx11-xcb-dev, libxt-dev, llvm-dev (>= 4.0) | llvm-4.0-dev | llvm-6.0-dev | llvm-7-dev, locales, lsb-release, nasm (>= 2.13), python2 (>= 2.7.18-2~) | python (>= 2.7), rustc (>= 1.34), unzip, xauth, xfonts-base, xvfb, yasm (>= 1.1), zip, zlib1g-dev, libfontconfig-dev
 Package-List:
  waterfox deb web optional arch=any
 Files:
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