summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2021-12-06 14:28:30 +0000
committerB. Stack <bgstack15@gmail.com>2021-12-06 14:28:30 +0000
commit8304a50398979ed108a2efd603d9eaf371459c6f (patch)
tree8e282eb911da68f073a3cff7e0f33a8c0dcc40d0
parentMerge branch 'newmoon-bump' into 'master' (diff)
parentwaterfox 2021-11 rc1 (diff)
downloadstackrpms-8304a50398979ed108a2efd603d9eaf371459c6f.tar.gz
stackrpms-8304a50398979ed108a2efd603d9eaf371459c6f.tar.bz2
stackrpms-8304a50398979ed108a2efd603d9eaf371459c6f.zip
Merge branch 'waterfox-bump' into 'master'
waterfox 2021.11 See merge request bgstack15/stackrpms!273
-rw-r--r--waterfox/debian/changelog6
-rw-r--r--waterfox/debian/waterfox+devuan.dsc2
-rw-r--r--waterfox/waterfox.spec33
3 files changed, 24 insertions, 17 deletions
diff --git a/waterfox/debian/changelog b/waterfox/debian/changelog
index 8f72854..42ff38d 100644
--- a/waterfox/debian/changelog
+++ b/waterfox/debian/changelog
@@ -1,3 +1,9 @@
+waterfox (2021.11-1+devuan) obs; urgency=medium
+
+ - latest version
+
+ -- B. Stack <bgstack15@gmail.com> Mon, 29 Nov 2021 08:36:15 -0500
+
waterfox (2021.10-1+devuan) obs; urgency=medium
- latest version
diff --git a/waterfox/debian/waterfox+devuan.dsc b/waterfox/debian/waterfox+devuan.dsc
index 3a7728b..7c5e67f 100644
--- a/waterfox/debian/waterfox+devuan.dsc
+++ b/waterfox/debian/waterfox+devuan.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
Source: waterfox
Binary: waterfox
Architecture: any
-Version: 2021.10-1+devuan
+Version: 2021.11-1+devuan
Maintainer: B. Stack <bgstack15@gmail.com>
Homepage: https://www.waterfox.net/
Standards-Version: 4.1.4
diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec
index c2ed9d9..621a924 100644
--- a/waterfox/waterfox.spec
+++ b/waterfox/waterfox.spec
@@ -6,6 +6,7 @@
%global with_snapshot 0
%global branch classic
+%global channel Classic
%global freebsd_rev 20191102
%global freebsd_root %{name}-FreeBSD-patches-%{freebsd_rev}
@@ -123,12 +124,6 @@ ExcludeArch: armv7hl
%global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536)
%endif
-%if "%{branch}" == "classic"
-%global channel Classic
-%else
-%global channel Current
-%endif
-
%global mozappdir %{_libdir}/%{name}
%global mozappdirdev %{_libdir}/%{name}-devel-%{version}
%global langpackdir %{mozappdir}/langpacks
@@ -169,18 +164,18 @@ BuildRequires: %{scl_buildreq}
%global system_libvpx 0
%endif
-Summary: Waterfox Web browser
+Summary: Waterfox %{channel} Web browser
Name: waterfox
-Version: 2021.10
+Version: 2021.11
Release: 11%{?branch:.%{branch}}%{?gver}%{?dist}
-URL: https://www.waterfox.net
+URL: https://classic.waterfox.net
License: MPLv1.1 or GPLv2+ or LGPLv2+
%global vc_url https://github.com/WaterfoxCo/Waterfox
%if 0%{?with_snapshot}
-Source0: %{vc_url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
+Source0: %{vc_url}/archive/%{commit}/%{name}-%{channel}-%{shortcommit}.tar.gz
%else
-Source0: %{vc_url}/archive/%{version}-%{branch}/%{name}-%{version}-%{branch}.tar.gz
+Source0: %{vc_url}/archive/%{version}-%{branch}/%{name}-%{branch}-%{version}.tar.gz
%endif
# FreeBSD patches
@@ -386,10 +381,12 @@ BuildRequires: cargo
Obsoletes: mozilla <= 37:1.7.13
Provides: webclient
+Provides: %{name}-%{branch} = %{?epoch:%{epoch}:}%{version}-%{release}
%description
-Waterfox is an open-source web browser, specialised modification of the Mozilla
-platform, designed for privacy and user choice in mind.
+Waterfox %{channel} is an open-source web browser, specialised
+modification of the Mozilla platform, designed for privacy and user
+choice in mind.
%if %{run_tests}
%global testsuite_pkg_name %{name}-testresults
@@ -405,9 +402,9 @@ This package contains results of tests executed during build.
%prep
%if 0%{?with_snapshot}
-%setup -q -n Waterfox-%{commit} -a 600
+%setup -q -n Waterfox-%{channel}-%{commit} -a 600
%else
-%setup -q -n Waterfox-%{version}-%{branch} -a 600
+%setup -q -n Waterfox-%{channel}-%{version}-%{branch} -a 600
%endif
%if %{build_langpacks}
@@ -1128,11 +1125,15 @@ fi
#---------------------------------------------------------------------
%changelog
-* Thu Oct 21 2021 B. Stack <bgstack15@gmail.com> - 2021.10-11.classic
+* Mon Nov 29 2021 B. Stack <bgstack15@gmail.com> - 2021.11-11.classic
- add el7 and el8 support
- repackage for stackrpms
- disable simd globally
+* Fri Nov 19 2021 Phantom X <megaphantomx at hotmail dot com> - 2021.11-1.classic
+- 2021.11
+- Update URLs to new Classic repository
+
* Wed Oct 20 2021 Phantom X <megaphantomx at hotmail dot com> - 2021.10-1.classic
- 2021.10
bgstack15