Merge branch 'f32' into f31

.gitignore

@@ -116,3 +116,7 @@
 /icecat-68.9.0-rh1.tar.bz2
 /icecat-68.9.0-rh2.tar.bz2
 /icecat-68.9.0-langpacks.tar.gz
+/icecat-68.11.0-langpacks.tar.gz
+/icecat-68.11.0-rh1.tar.bz2
+/icecat-68.12.0-langpacks.tar.gz
+/icecat-68.12.0-rh1.tar.bz2

icecat-lang_download.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 
-VERSION=68.9.0
-URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
+VERSION=68.12.0
+#URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/
+URL=https://archive.mozilla.org/pub/firefox/candidates/${VERSION}esr-candidates/build1/linux-x86_64/xpi/
 
 for u in $URL; do
   mkdir -p langpacks && pushd langpacks

icecat.spec

@@ -79,7 +79,7 @@ ExcludeArch: %{arm} s390x
 
 # Set new source-code build version
 # This tag indicates a new rebuild for Fedora
-%global redhat_ver rh2
+%global redhat_ver rh1
 
 # Set extra version tag
 # This tag comes from Mozilla's releases
@@ -94,8 +94,8 @@ ExcludeArch: %{arm} s390x
 %endif
 
 Name: icecat
-Version: 68.9.0
-Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Version: 68.12.0
+Release: 2%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
 Summary: GNU version of Firefox browser
 
 # Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the extensions included
@@ -578,6 +578,7 @@ MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads -Wl,--print-m
 MOZ_LINK_FLAGS="-Wl,-fuse-ld=gold -Wl,--no-keep-memory -Wl,--no-map-whole-files -Wl,--no-mmap-output-file"
 %endif
 %endif
+
 %ifarch %{arm} %{ix86}
 export RUSTFLAGS="-Cdebuginfo=0"
 export MOZ_RUST_DEFAULT_FLAGS="-Cdebuginfo=0 -Copt-level=0"
@@ -740,6 +741,9 @@ mkdir -p $RPM_BUILD_ROOT%{_metainfodir}
 install -pm 644 %{SOURCE10} $RPM_BUILD_ROOT%{_metainfodir}/
 install -pm 644 %{SOURCE11} $RPM_BUILD_ROOT%{_metainfodir}/
 
+# Remove obsolete addon
+rm -f $RPM_BUILD_ROOT%{icecatappdir}/browser/extensions/tortm*.xpi
+
 # Moves defaults/preferences to browser/defaults/preferences
 %pretrans -p <lua>
 require 'posix'
@@ -812,6 +816,16 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %endif
 
 %changelog
+* Wed Sep 09 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.12.0-2.rh1
+- Remove obsolete Onion Browser button (rhbz#1842171)
+
+* Sun Aug 23 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.12.0-1.rh1
+- Mozilla Release 68.12.0ESR
+
+* Tue Jul 28 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.11.0-1.rh1
+- Mozilla release 68.11.0ESR
+- Try to pass Rust cflags (mozilla bug 1640982#c18)
+
 * Tue Jun 02 2020 Antonio Trande <sagitter@fedoraproject.org> - 68.9.0-1.rh2
 - Mozilla release 68.9.0ESR
 

sources

@@ -1,5 +1,5 @@
-SHA512 (cbindgen-vendor.tar.xz) = 562433358bcce81852e5e013068a0961be61785917094b3c0c93df34bc4a060eea6e89d86951f76e9e3d9644a56cf756f7278c8fa85b8a4a8b8c8b58c16a8b7c
-SHA512 (icecat-68.9.0-langpacks.tar.gz) = d3f1acf7505193e587338ffdf3d542dad9b04289d3a87de16e5a36a77624d5ad9d4a3366166fdf2e58066b0bf3bb86adbd66f241f3080a5a395960da806a2f94
-SHA512 (icecat-68.9.0-rh2.tar.bz2) = 080e9765850ece232f1888a2c59f8a65ffeeeea7aeeb9b4fdc6dd6c88bdc3dda2fd0b5585b61c5cbb57d860b85ede59f3c2c6d75be80cb58aaf0b0d501603af5
-SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
 SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c
+SHA512 (cbindgen-vendor.tar.xz) = 562433358bcce81852e5e013068a0961be61785917094b3c0c93df34bc4a060eea6e89d86951f76e9e3d9644a56cf756f7278c8fa85b8a4a8b8c8b58c16a8b7c
+SHA512 (icecat-68.12.0-langpacks.tar.gz) = e88a3dd198c989a348e10521a2ce3a893bd6fc9a55b9c2ac29888e06a4f4cec82fd6f13a76a09c488a841a0ab2d642d0dfca2d6cc48afd24e2037a1299062236
+SHA512 (icecat-68.12.0-rh1.tar.bz2) = 4af3d796008598cfef920f9a4d6246036fe7e23d837147de80a1f9047f1fe359ef6dba3756c6d06b0bf45497f11eb40415860d84face3dc7e553d265cacdaad5
+SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c