From 792c9e380f5ad95ba763be3b04b42daac3af1db2 Mon Sep 17 00:00:00 2001 From: sagitter Date: Tue, 28 Jul 2020 15:54:51 +0200 Subject: [PATCH 01/12] Mozilla release 68.11.0ESR --- .gitignore | 2 ++ icecat-lang_download.sh | 2 +- icecat.spec | 7 +++++-- sources | 6 +----- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 978d442..9953151 100644 --- a/.gitignore +++ b/.gitignore @@ -116,3 +116,5 @@ /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 diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh index 98e58f8..eb0df88 100755 --- a/icecat-lang_download.sh +++ b/icecat-lang_download.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=68.9.0 +VERSION=68.11.0 URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_64/xpi/ for u in $URL; do diff --git a/icecat.spec b/icecat.spec index 36d5eac..ef55295 100644 --- a/icecat.spec +++ b/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,7 +94,7 @@ ExcludeArch: %{arm} s390x %endif Name: icecat -Version: 68.9.0 +Version: 68.11.0 Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist} Summary: GNU version of Firefox browser @@ -812,6 +812,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %endif %changelog +* Tue Jul 28 2020 Antonio Trande - 68.11.0-1.rh1 +- Mozilla release 68.11.0ESR + * Tue Jun 02 2020 Antonio Trande - 68.9.0-1.rh2 - Mozilla release 68.9.0ESR diff --git a/sources b/sources index a8a1d25..d0ec64e 100644 --- a/sources +++ b/sources @@ -1,5 +1 @@ -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 (icecat-68.11.0-rh1.tar.bz2) = da2fe1ebd0b04fc6208ee8f88c624d1882dd0c737f913e961339a7df84e403a1b7a7ead07df5f73b7b29fa0fbc3c77ea9ff122615ff7b2e0c5e3ecf3aaccad18 From eeefaef16185e35182d81d027453bcd4e30000ef Mon Sep 17 00:00:00 2001 From: sagitter Date: Tue, 28 Jul 2020 16:04:00 +0200 Subject: [PATCH 02/12] Verify source files commit --- sources | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sources b/sources index d0ec64e..a776ef0 100644 --- a/sources +++ b/sources @@ -1 +1,5 @@ +SHA512 (cbindgen-vendor.tar.xz) = 562433358bcce81852e5e013068a0961be61785917094b3c0c93df34bc4a060eea6e89d86951f76e9e3d9644a56cf756f7278c8fa85b8a4a8b8c8b58c16a8b7c +SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c +SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c +SHA512 (icecat-68.11.0-langpacks.tar.gz) = abb2c90f71c1226d70904f0f711da99bee0c01615b05845cdc067e7a7d3de135a71a3465725bdf86314ff72baa6f0ec39f1f687f99beb05808ae3fbf7b8ac273 SHA512 (icecat-68.11.0-rh1.tar.bz2) = da2fe1ebd0b04fc6208ee8f88c624d1882dd0c737f913e961339a7df84e403a1b7a7ead07df5f73b7b29fa0fbc3c77ea9ff122615ff7b2e0c5e3ecf3aaccad18 From 3a0c4590e53b79185b5b6ff38b0784b5634c5cb9 Mon Sep 17 00:00:00 2001 From: sagitter Date: Tue, 28 Jul 2020 18:21:41 +0200 Subject: [PATCH 03/12] Try to pass Rust cflags (mozilla bug 1640982#c18) --- icecat.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/icecat.spec b/icecat.spec index ef55295..adf8a56 100644 --- a/icecat.spec +++ b/icecat.spec @@ -578,10 +578,15 @@ 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 + +# https://bugzilla.mozilla.org/show_bug.cgi?id=1640982#c18 +export RUSTFLAGS="-Clto" +export MOZ_RUST_DEFAULT_FLAGS="-Clto" %ifarch %{arm} %{ix86} -export RUSTFLAGS="-Cdebuginfo=0" -export MOZ_RUST_DEFAULT_FLAGS="-Cdebuginfo=0 -Copt-level=0" +export RUSTFLAGS="$RUSTFLAGS -Cdebuginfo=0" +export MOZ_RUST_DEFAULT_FLAGS="$MOZ_RUST_DEFAULT_FLAGS -Cdebuginfo=0 -Copt-level=0" %endif +export CARGO_PROFILE_RELEASE_LTO=true export CFLAGS=$MOZ_OPT_FLAGS export CXXFLAGS=$MOZ_OPT_FLAGS export LDFLAGS=$MOZ_LINK_FLAGS @@ -814,6 +819,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %changelog * Tue Jul 28 2020 Antonio Trande - 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 - 68.9.0-1.rh2 - Mozilla release 68.9.0ESR From 65fde67a4d20c7265569195b85a4ff3c5a2d881d Mon Sep 17 00:00:00 2001 From: sagitter Date: Tue, 28 Jul 2020 19:03:56 +0200 Subject: [PATCH 04/12] Add patch for mozilla bug #1640982 --- icecat.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/icecat.spec b/icecat.spec index adf8a56..fabf92c 100644 --- a/icecat.spec +++ b/icecat.spec @@ -166,6 +166,7 @@ Patch226: rhbz-1354671.patch # Upstream patches Patch414: Bug-1238661_fix-mozillaSignalTrampoline-to-work-.patch +Patch415: mozilla-1640982.patch # Patches for compatibility with Rust-1.39 Patch419: mozilla-1564873.patch @@ -367,6 +368,7 @@ tar -xf %{SOURCE5} %patch26 -p1 -b .icu %endif +%patch415 -p1 -b .mozilla-1640982 %patch419 -p1 -b .mozilla-1564873 %patch423 -p1 -b .mozilla-1596503 @@ -579,14 +581,10 @@ MOZ_LINK_FLAGS="-Wl,-fuse-ld=gold -Wl,--no-keep-memory -Wl,--no-map-whole-files %endif %endif -# https://bugzilla.mozilla.org/show_bug.cgi?id=1640982#c18 -export RUSTFLAGS="-Clto" -export MOZ_RUST_DEFAULT_FLAGS="-Clto" %ifarch %{arm} %{ix86} -export RUSTFLAGS="$RUSTFLAGS -Cdebuginfo=0" -export MOZ_RUST_DEFAULT_FLAGS="$MOZ_RUST_DEFAULT_FLAGS -Cdebuginfo=0 -Copt-level=0" +export RUSTFLAGS="-Cdebuginfo=0" +export MOZ_RUST_DEFAULT_FLAGS="-Cdebuginfo=0 -Copt-level=0" %endif -export CARGO_PROFILE_RELEASE_LTO=true export CFLAGS=$MOZ_OPT_FLAGS export CXXFLAGS=$MOZ_OPT_FLAGS export LDFLAGS=$MOZ_LINK_FLAGS From dbc71e962f1a88a634966f375116fe705ef07c32 Mon Sep 17 00:00:00 2001 From: sagitter Date: Tue, 28 Jul 2020 19:07:25 +0200 Subject: [PATCH 05/12] Add patch file for mozilla bug #1640982 --- mozilla-1640982.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 mozilla-1640982.patch diff --git a/mozilla-1640982.patch b/mozilla-1640982.patch new file mode 100644 index 0000000..b63ba3b --- /dev/null +++ b/mozilla-1640982.patch @@ -0,0 +1,16 @@ +diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk +--- a/config/makefiles/rust.mk ++++ b/config/makefiles/rust.mk +@@ -61,7 +61,11 @@ + # Enable link-time optimization for release builds, but not when linking + # gkrust_gtest. + ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE))) ++# Pass -Clto for older versions of rust, and CARGO_PROFILE_RELEASE_LTO=true ++# for newer ones that support it. Combining the latter with -Clto works, so ++# set both everywhere. + cargo_rustc_flags += -Clto ++export CARGO_PROFILE_RELEASE_LTO=true + endif + endif + endif + From 736a692e7c4e11ec77c5b495e4bc8aae5b85870b Mon Sep 17 00:00:00 2001 From: sagitter Date: Tue, 28 Jul 2020 19:32:44 +0200 Subject: [PATCH 06/12] Fix patch #1640982 --- mozilla-1640982.patch | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/mozilla-1640982.patch b/mozilla-1640982.patch index b63ba3b..b9cffae 100644 --- a/mozilla-1640982.patch +++ b/mozilla-1640982.patch @@ -1,16 +1,14 @@ diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk --- a/config/makefiles/rust.mk +++ b/config/makefiles/rust.mk -@@ -61,7 +61,11 @@ - # Enable link-time optimization for release builds, but not when linking - # gkrust_gtest. - ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE))) -+# Pass -Clto for older versions of rust, and CARGO_PROFILE_RELEASE_LTO=true -+# for newer ones that support it. Combining the latter with -Clto works, so +@@ -48,6 +48,10 @@ + ifndef MOZ_DEBUG_RUST + # Enable link-time optimization for release builds. + cargo_rustc_flags += -C lto ++# Pass CARGO_PROFILE_RELEASE_LTO=true ++# for newer Rust versions that support it. Combining the latter with -Clto works, so +# set both everywhere. - cargo_rustc_flags += -Clto +export CARGO_PROFILE_RELEASE_LTO=true endif endif - endif - + From 5c6a1d351cbf9608677e918fae9c7f79eaa82bc0 Mon Sep 17 00:00:00 2001 From: sagitter Date: Sun, 23 Aug 2020 15:20:15 +0200 Subject: [PATCH 07/12] Mozilla Release Candidate 68.12.0ESR --- .gitignore | 2 ++ icecat-lang_download.sh | 5 +++-- icecat.spec | 5 ++++- sources | 4 ---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 9953151..8c49602 100644 --- a/.gitignore +++ b/.gitignore @@ -118,3 +118,5 @@ /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 diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh index eb0df88..ad538f6 100755 --- a/icecat-lang_download.sh +++ b/icecat-lang_download.sh @@ -1,7 +1,8 @@ #!/bin/bash -VERSION=68.11.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 diff --git a/icecat.spec b/icecat.spec index fabf92c..8a82e55 100644 --- a/icecat.spec +++ b/icecat.spec @@ -94,7 +94,7 @@ ExcludeArch: %{arm} s390x %endif Name: icecat -Version: 68.11.0 +Version: 68.12.0 Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist} Summary: GNU version of Firefox browser @@ -815,6 +815,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %endif %changelog +* Sun Aug 23 2020 Antonio Trande - 68.12.0-1.rh1 +- Mozilla release 68.12.0ESR + * Tue Jul 28 2020 Antonio Trande - 68.11.0-1.rh1 - Mozilla release 68.11.0ESR - Try to pass Rust cflags (mozilla bug 1640982#c18) diff --git a/sources b/sources index a776ef0..54f9257 100644 --- a/sources +++ b/sources @@ -1,5 +1 @@ -SHA512 (cbindgen-vendor.tar.xz) = 562433358bcce81852e5e013068a0961be61785917094b3c0c93df34bc4a060eea6e89d86951f76e9e3d9644a56cf756f7278c8fa85b8a4a8b8c8b58c16a8b7c SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c -SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c -SHA512 (icecat-68.11.0-langpacks.tar.gz) = abb2c90f71c1226d70904f0f711da99bee0c01615b05845cdc067e7a7d3de135a71a3465725bdf86314ff72baa6f0ec39f1f687f99beb05808ae3fbf7b8ac273 -SHA512 (icecat-68.11.0-rh1.tar.bz2) = da2fe1ebd0b04fc6208ee8f88c624d1882dd0c737f913e961339a7df84e403a1b7a7ead07df5f73b7b29fa0fbc3c77ea9ff122615ff7b2e0c5e3ecf3aaccad18 From 33d750027fa77a6d5fae7da0eb162226991b80dd Mon Sep 17 00:00:00 2001 From: sagitter Date: Sun, 23 Aug 2020 15:28:55 +0200 Subject: [PATCH 08/12] Mozilla release 68.12.0ESR --- sources | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources b/sources index 54f9257..3e36edf 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c +SHA512 (cbindgen-vendor.tar.xz) = 562433358bcce81852e5e013068a0961be61785917094b3c0c93df34bc4a060eea6e89d86951f76e9e3d9644a56cf756f7278c8fa85b8a4a8b8c8b58c16a8b7c +SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c From 912f9b975f9ea0f861c60dff09f17bf02efc1331 Mon Sep 17 00:00:00 2001 From: sagitter Date: Sun, 23 Aug 2020 15:30:31 +0200 Subject: [PATCH 09/12] Mozilla release 68.12.0ESR --- sources | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sources b/sources index 3e36edf..54f9257 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (cbindgen-vendor.tar.xz) = 562433358bcce81852e5e013068a0961be61785917094b3c0c93df34bc4a060eea6e89d86951f76e9e3d9644a56cf756f7278c8fa85b8a4a8b8c8b58c16a8b7c -SHA512 (icecat-COPYING-licensefiles.tar.gz) = ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c +SHA512 (icecat.png) = a3cec16cb15a27c3c91b53e2c534e78b07911011ff1331e450c0baf8e13b76da7cea2a90e5d75191fa88cfbfd40a0a7f3e553e92b64d0043dadd5ad5edfdf81c From 87621a1f7de25211139b837baf1cab964c1cb62f Mon Sep 17 00:00:00 2001 From: sagitter Date: Sun, 23 Aug 2020 15:32:37 +0200 Subject: [PATCH 10/12] Mozilla release 68.12.0ESR --- sources | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sources b/sources index 54f9257..9657da0 100644 --- a/sources +++ b/sources @@ -1 +1,5 @@ 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 From fea84c649dbf18bae4ebe0a514cbd4364e2bf25c Mon Sep 17 00:00:00 2001 From: sagitter Date: Sun, 23 Aug 2020 15:54:37 +0200 Subject: [PATCH 11/12] Mozilla Release 68.12.0ESR --- icecat.spec | 4 +--- mozilla-1640982.patch | 14 -------------- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 mozilla-1640982.patch diff --git a/icecat.spec b/icecat.spec index 8a82e55..5e9f2d2 100644 --- a/icecat.spec +++ b/icecat.spec @@ -166,7 +166,6 @@ Patch226: rhbz-1354671.patch # Upstream patches Patch414: Bug-1238661_fix-mozillaSignalTrampoline-to-work-.patch -Patch415: mozilla-1640982.patch # Patches for compatibility with Rust-1.39 Patch419: mozilla-1564873.patch @@ -368,7 +367,6 @@ tar -xf %{SOURCE5} %patch26 -p1 -b .icu %endif -%patch415 -p1 -b .mozilla-1640982 %patch419 -p1 -b .mozilla-1564873 %patch423 -p1 -b .mozilla-1596503 @@ -816,7 +814,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %changelog * Sun Aug 23 2020 Antonio Trande - 68.12.0-1.rh1 -- Mozilla release 68.12.0ESR +- Mozilla Release 68.12.0ESR * Tue Jul 28 2020 Antonio Trande - 68.11.0-1.rh1 - Mozilla release 68.11.0ESR diff --git a/mozilla-1640982.patch b/mozilla-1640982.patch deleted file mode 100644 index b9cffae..0000000 --- a/mozilla-1640982.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk ---- a/config/makefiles/rust.mk -+++ b/config/makefiles/rust.mk -@@ -48,6 +48,10 @@ - ifndef MOZ_DEBUG_RUST - # Enable link-time optimization for release builds. - cargo_rustc_flags += -C lto -+# Pass CARGO_PROFILE_RELEASE_LTO=true -+# for newer Rust versions that support it. Combining the latter with -Clto works, so -+# set both everywhere. -+export CARGO_PROFILE_RELEASE_LTO=true - endif - endif - From 098e69f05f2224099180c5e45b4c3fa4eae96799 Mon Sep 17 00:00:00 2001 From: sagitter Date: Wed, 9 Sep 2020 23:18:01 +0200 Subject: [PATCH 12/12] Remove obsolete Onion Browser button (rhbz#1842171) --- icecat.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/icecat.spec b/icecat.spec index 5e9f2d2..d6697de 100644 --- a/icecat.spec +++ b/icecat.spec @@ -95,7 +95,7 @@ ExcludeArch: %{arm} s390x Name: icecat Version: 68.12.0 -Release: 1%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist} +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 @@ -741,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 require 'posix' @@ -813,6 +816,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %endif %changelog +* Wed Sep 09 2020 Antonio Trande - 68.12.0-2.rh1 +- Remove obsolete Onion Browser button (rhbz#1842171) + * Sun Aug 23 2020 Antonio Trande - 68.12.0-1.rh1 - Mozilla Release 68.12.0ESR