The package rpms/icecat.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/icecat.git/commit/?id=0807c29735d....
Change:
+%ifnarch %{ix86} x86_64 ppc64le
Thanks.
Full change:
============
commit 2b48fe50b94fd23566e164101887830edbf550cf
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Mon Sep 2 20:29:50 2019 +0200
Mozilla release 60.9.0
diff --git a/.gitignore b/.gitignore
index 0e7fd6c..43b3979 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,3 +83,5 @@
/icecat-60.7.2-langpacks.tar.gz
/icecat-60.8.0-gnu1.tar.bz2
/icecat-60.8.0-langpacks.tar.gz
+/icecat-60.9.0-gnu1.tar.bz2
+/icecat-60.9.0-langpacks.tar.gz
diff --git a/icecat-fix_installer.patch b/icecat-fix_installer.patch
index a56a880..6ed1704 100644
--- a/icecat-fix_installer.patch
+++ b/icecat-fix_installer.patch
@@ -32,23 +32,10 @@
--- browser/installer/allowed-dupes.orig.mn 2017-03-19 19:59:09.000000000 +0100
+++ browser/installer/allowed-dupes.mn 2017-03-24 23:15:37.026964374 +0100
-@@ -752,3 +752,19 @@
- browser/extensions/tprb.addon(a)searxes.danwin1210.me/manifest.json
- browser/extensions/tprb.addon(a)searxes.danwin1210.me/tprb_dlg.html
- browser/extensions/tprb.addon(a)searxes.danwin1210.me/style.css
+@@ -771,3 +771,6 @@
+ browser/extensions/SubmitMe(a)0xbeef.coffee/License
+ browser/extensions/SubmitMe(a)0xbeef.coffee/manifest.json
+ browser/extensions/SubmitMe(a)0xbeef.coffee/improve_css.js
+#
+browser/extensions/abouticecat(a)gnu.org/defaults/preferences/preferences.js
-+browser/extensions/html5-video-everywhere(a)lejenome.me/bootstrap.js
+browser/chrome/browser/content/browser/aboutaccounts/images/fox.png
-+browser/extensions/spyblock(a)gnu.org/chrome/content/ui/ext/common.js
-+browser/extensions/spyblock(a)gnu.org/lib/ext_common.js
-+browser/extensions/html5-video-everywhere(a)lejenome.me/LICENSE
-+browser/extensions/html5-video-everywhere(a)lejenome.me/node_modules/h5vew-site-break/LICENSE
-+browser/extensions/html5-video-everywhere(a)lejenome.me/node_modules/h5vew-site-dailymotion/LICENSE
-+browser/extensions/html5-video-everywhere(a)lejenome.me/node_modules/h5vew-site-facebook/LICENSE
-+browser/extensions/html5-video-everywhere(a)lejenome.me/node_modules/h5vew-site-metacafe/LICENSE
-+browser/extensions/html5-video-everywhere(a)lejenome.me/node_modules/h5vew-site-vimeo/LICENSE
-+browser/extensions/html5-video-everywhere(a)lejenome.me/node_modules/h5vew-site-youtube/LICENSE
-+browser/extensions/spyblock(a)gnu.org/chrome/content/ui/skin/abp-128.png
-+browser/extensions/spyblock(a)gnu.org/chrome/skin/abp-icon-big.png
-+#
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index 832a09b..2832b59 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-VERSION=60.8.0
+VERSION=60.9.0
URL=https://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/linux-x86_...
for u in $URL; do
diff --git a/icecat.rpmlintrc b/icecat.rpmlintrc
deleted file mode 100644
index c2c8f6f..0000000
--- a/icecat.rpmlintrc
+++ /dev/null
@@ -1,40 +0,0 @@
-# Whitelisting errors
-#
https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#whitelist
-# Edited by sagitter (sagitter AT fedoraproject dot org)
-
-# KNOWN BUGS:
-#
-
-# TESTS:
-##### SRPMs #####
-
-# ifarch applied patches are okay
-#
https://fedoraproject.org/wiki/Packaging:Guidelines#Architecture_Support
-addFilter(r'(%ifarch-applied-patch) Patch*')
-
-# ERRORS:
-##### RPMs #####
-
-# chroot function (??)
-addFilter(r'(missing-call-to-chdir-with-chroot)
%{_libdir}/icecat/libmozsandbox.so')
-addFilter(r'(missing-call-to-setgroups-before-setuid)
%{_libdir}/icecat/libxul.so')
-
-# Expected on FF browser
-#
https://support.mozilla.org/en-US/questions/1045418
-addFilter(r'(zero-length) %{_libdir}/icecat/chrome.manifest')
-addFilter(r'(zero-length) %{_libdir}/icecat/browser/chrome.manifest')
-
-# False positive
-addFilter(r'(dangling-symlink) %{_libdir}/icecat/dictionaries
%{_datadir}/myspell')
-addFilter(r'(unversioned-explicit-provides) webclient')
-
-# WARNINGS:
-##### RPMs #####
-
-addFilter(r'(no-manual-page-for-binary) icecat-wayland')
-
-##### SRPMs #####
-# Different file size due to the signature of the source code tarbz archive
-addFilter(r'file-size-mismatch')
-
-addFilter(r'(invalid-url) Source*')
diff --git a/icecat.spec b/icecat.spec
index 532c4dd..7cef988 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -73,8 +73,8 @@ ExcludeArch: %{arm}
%global gnu_ver gnu1
Name: icecat
-Version: 60.8.0
-Release: 6.%{gnu_ver}%{?dist}
+Version: 60.9.0
+Release: 1.%{gnu_ver}%{?dist}
Summary: GNU version of Firefox browser
## Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the
extensions included
@@ -749,6 +749,9 @@ appstream-util validate-relax --nonet
$RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
%endif
%changelog
+* Mon Sep 02 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.9.0-1.gnu1
+- Mozilla release 60.9.0
+
* Sun Jul 28 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-6.gnu1
- Add patch to fix the addon installation
diff --git a/sources b/sources
index e5e5f07..cccd512 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (icecat-60.8.0-gnu1.tar.bz2) =
31900c921102ccaa736b8be20210d16b7bae9c797d2529e9f38e803d834c72bacfe6e586934e21c48ca7097cc0bbc56adccc6beefc5f42b1e7ee4a3d93e9f223
-SHA512 (icecat-60.8.0-langpacks.tar.gz) =
82f63a5c0e7b4af8ed616d94f99274c4a54fa092147bcce3eb4f77026b562a8109cc289fec18abdf0e350484a8645eb32f173fbbe3e20cb12f8fb79cea52554b
+SHA512 (icecat-60.9.0-gnu1.tar.bz2) =
6080c41bf1235b9d13ecb0f62e41af42d8180854a140420552128c1707f639fd73623910410ac0ce20f289e4c3ea010b70559d750ac0fb4f93b9642ff2c2cadb
+SHA512 (icecat-60.9.0-langpacks.tar.gz) =
14117477b4be24445326f78022ba40d1972e4f82ff888e8dcbba032afede0eb52e43ae6bc1354955fa0ba46fbfe3b668fe3e925fccb2a4769eb7476be8b30737
SHA512 (icecat-COPYING-licensefiles.tar.gz) =
ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c
commit aadd0f7984d281bd38f0acab97dde18772444dd9
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sun Jul 28 12:55:24 2019 +0200
Add patch to fix the addon installation
diff --git a/icecat-fix_addon_installation.patch b/icecat-fix_addon_installation.patch
new file mode 100644
index 0000000..fd83f72
--- /dev/null
+++ b/icecat-fix_addon_installation.patch
@@ -0,0 +1,36 @@
+# Fixes installation of those addons which don't have ID on IceCat ("Cannot find
id for addon" error).
+--- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm
++++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm
+@@ -885,8 +885,30 @@
+ throw new Error(`Webextension is signed with an invalid id (${addon.id})`);
+ }
+ }
+- if (!addon.id && aInstallLocation.name == KEY_APP_TEMPORARY) {
+- addon.id = generateTemporaryInstallID(aZipReader.file);
++ if (!addon.id) {
++ if (aInstallLocation.name == KEY_APP_TEMPORARY) {
++ addon.id = generateTemporaryInstallID(aZipReader.file);
++ } else {
++ try {
++ let sigInput = aZipReader.getInputStream("META-INF/cose.sig");
++ let sigBinary = Cc['(a)mozilla.org/binaryinputstream;1']
++ .createInstance(Ci.nsIBinaryInputStream);
++ sigBinary.setInputStream(sigInput);
++ var sig = ''
++ var sigCount;
++ while ((sigCount = sigBinary.available()) > 0) {
++ sig += sigBinary.readBytes(sigCount);
++ }
++ let sigMatch = sig.match(/\{\w{8}-\w{4}-\w{4}-\w{4}-\w{12}\}/g)
++ if (sigMatch && sigMatch.length == 1) {
++ addon.id = sigMatch[0]
++ } else {
++ logger.warn("Failed to find addon id");
++ }
++ } catch (e) {
++ logger.warn("Failed to process META-INF/cose.sig");
++ }
++ }
+ }
+ }
+ addon.updateBlocklistState();
diff --git a/icecat.spec b/icecat.spec
index 8ef2ac9..532c4dd 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -116,7 +116,10 @@ Source15: %{name}-x11.sh.in
Source16: %{name}-x11.desktop
# Build patches
-Patch2: %{name}-libevent_linkflag.patch
+# Fixes installation of those addons which don't have ID on IceCat ("Cannot find
id for addon" error).
+Patch1: %{name}-fix_addon_installation.patch
+
+Patch2: %{name}-libevent_linkflag.patch
Patch3: mozilla-build-arm.patch
# Unrecognized file?
@@ -311,6 +314,7 @@ find . -type f -name "*.c" -exec chmod 0644 '{}' \;
##Copy license files
tar -xf %{SOURCE5}
+%patch1 -p1 -b .fix_addon_installation
%patch2 -p0 -b .libevent_linkflag
%patch3 -p1 -b .arm
%patch7 -p0
@@ -631,7 +635,7 @@ echo "%%lang($language_short)
%{langpackdir}/langpack-$language_short(a)icecat.moz
}
# Table of fallbacks for each language
-create_default_langpack "bn-IN" "bn"
+#create_default_langpack "bn-IN" "bn"
create_default_langpack "es-AR" "es"
create_default_langpack "fy-NL" "fy"
create_default_langpack "ga-IE" "ga"
@@ -745,6 +749,9 @@ appstream-util validate-relax --nonet
$RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
%endif
%changelog
+* Sun Jul 28 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-6.gnu1
+- Add patch to fix the addon installation
+
* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
60.8.0-6.gnu1
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
commit 5a3172c7bb2151edf0a8ccbdcc975be0db86cb99
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 25 09:19:01 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/icecat.spec b/icecat.spec
index d082ede..8ef2ac9 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -74,7 +74,7 @@ ExcludeArch: %{arm}
Name: icecat
Version: 60.8.0
-Release: 5.%{gnu_ver}%{?dist}
+Release: 6.%{gnu_ver}%{?dist}
Summary: GNU version of Firefox browser
## Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the
extensions included
@@ -745,6 +745,9 @@ appstream-util validate-relax --nonet
$RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
%endif
%changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
60.8.0-6.gnu1
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
* Tue Jul 23 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-5.gnu1
- Enable WebRTC on ppc64le
commit 0807c29735dc39025e7c7805fb81d5908c43e459
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Tue Jul 23 10:26:04 2019 +0200
Enable WebRTC on ppc64le
diff --git a/icecat.spec b/icecat.spec
index dae34ef..d082ede 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -74,7 +74,7 @@ ExcludeArch: %{arm}
Name: icecat
Version: 60.8.0
-Release: 4.%{gnu_ver}%{?dist}
+Release: 5.%{gnu_ver}%{?dist}
Summary: GNU version of Firefox browser
## Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the
extensions included
@@ -364,7 +364,7 @@ cp -p %{SOURCE3} .mozconfig
echo "ac_add_options --enable-default-toolkit=cairo-gtk3-wayland" >>
.mozconfig
echo "ac_add_options --enable-official-branding" >> .mozconfig
-%ifnarch %{ix86} x86_64
+%ifnarch %{ix86} x86_64 ppc64le
echo "ac_add_options --disable-webrtc" >> .mozconfig
%else
echo "ac_add_options --enable-webrtc" >> .mozconfig
@@ -745,6 +745,9 @@ appstream-util validate-relax --nonet
$RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
%endif
%changelog
+* Tue Jul 23 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-5.gnu1
+- Enable WebRTC on ppc64le
+
* Fri Jul 12 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-4.gnu1
- Remove redundant Python2 dependencies
commit 53ba7d160f12e79e6f0f24111bfcd28c211140ec
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Jul 12 18:54:55 2019 +0200
Remove redundant Python2 dependencies
diff --git a/icecat.spec b/icecat.spec
index 0ad3784..dae34ef 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -74,7 +74,7 @@ ExcludeArch: %{arm}
Name: icecat
Version: 60.8.0
-Release: 3.%{gnu_ver}%{?dist}
+Release: 4.%{gnu_ver}%{?dist}
Summary: GNU version of Firefox browser
## Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the
extensions included
@@ -218,8 +218,6 @@ BuildRequires: openjpeg-devel
BuildRequires: pango-devel
BuildRequires: pipewire-devel
BuildRequires: python2-devel
-BuildRequires: python2-setuptools
-BuildRequires: python2-virtualenv
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(libstartup-notification-1.0)
@@ -747,6 +745,9 @@ appstream-util validate-relax --nonet
$RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
%endif
%changelog
+* Fri Jul 12 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-4.gnu1
+- Remove redundant Python2 dependencies
+
* Thu Jul 11 2019 Antonio Trande <sagitterATfedoraproject.org> - 60.8.0-3.gnu1
- Remove filtering of private libraries
- Enable webrtc on %%{ix86} x86_64 only