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=0252c7f475e....
Change:
-ExcludeArch: %{arm}
Thanks.
Full change:
============
commit 0252c7f475ef169555a98ba56defde5e457d0af9
Author: Antonio T <sagitter(a)fedoraproject.org>
Date: Sat Dec 26 17:12:01 2020 +0100
Use wayland/x11 launchers| Test ARM build with gcc-11.0.0-0.11
diff --git a/icecat.sh.in b/icecat.sh.in
index e4c1a24..d21c731 100644
--- a/icecat.sh.in
+++ b/icecat.sh.in
@@ -67,7 +67,7 @@ MOZ_PROGRAM="$MOZ_DIST_BIN/$MOZ_FIREFOX_FILE"
MOZ_LAUNCHER="$MOZ_DIST_BIN/run-icecat.sh"
##
-## Enable X11 backend by default?
+## Enable Wayland backend by default?
##
if __DEFAULT_WAYLAND__ && ! [ $MOZ_DISABLE_WAYLAND ]; then
if [ "$XDG_CURRENT_DESKTOP" == "GNOME" ]; then
@@ -75,6 +75,13 @@ if __DEFAULT_WAYLAND__ && ! [ $MOZ_DISABLE_WAYLAND ]; then
fi
fi
+##
+## Use D-Bus remote exclusively when there's Wayland display.
+##
+if [ "$WAYLAND_DISPLAY" ]; then
+ export MOZ_DBUS_REMOTE=1
+fi
+
##
## Set MOZ_GRE_CONF
##
@@ -173,6 +180,14 @@ if ! [ $MOZ_DISABLE_LANGPACKS ] || [ $MOZ_DISABLE_LANGPACKS -eq 0 ];
then
fi
fi
+# When IceCat is not running, restore SELinux labels for profile files
+# (rhbz#1731371)
+if [ $MOZILLA_DOWN -ne 0 ]; then
+ if [ -x $GETENFORCE_FILE ] && [ `getenforce` != "Disabled" ]; then
+ (restorecon -vr ~/.mozilla/icecat/* &)
+ fi
+fi
+
# Modify language pack configuration only when icecat is not running
# and language packs are not disabled
if [ $MOZILLA_DOWN -ne 0 ]; then
diff --git a/icecat.spec b/icecat.spec
index d1a3a62..5ad9622 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -17,7 +17,7 @@
%global extra_ver %{nil}
%endif
-%global pre_tag %{nil}
+%global pre_tag test
####################
@@ -42,7 +42,6 @@
%global build_with_pgo 0
%endif
%endif
-%global wayland_backend_default 1
# Disable LTO to work around rhbz#1883904
%define _lto_cflags %{nil}
@@ -60,7 +59,7 @@ ExcludeArch: ppc64le
# See
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.o...
%if 0%{?fedora} > 33
-ExcludeArch: %{arm}
+#ExcludeArch: %%{arm}
%endif
# Active/Deactive language files handling
@@ -136,7 +135,7 @@ ExcludeArch: %{arm}
Name: icecat
Version: 78.6.0
-Release: 5%{extra_ver}.%{redhat_ver}%{?pre_tag}%{?dist}
+Release: 6%{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
@@ -375,21 +374,19 @@ Extensions included to this version of IceCat:
requested. This implies not downloading feeds, updates, blacklists or any
other similar data needed during startup.
-%if 0%{?wayland_backend_default}
%package x11
Summary: GNU IceCat X11 launcher
Requires: %{name}
%description x11
The %{name}-x11 package contains launcher and desktop file
to run GNU IceCat native on X11.
-%else
+
%package wayland
Summary: GNU IceCat Wayland launcher
Requires: %{name}
%description wayland
The icecat-wayland package contains launcher and desktop file
to run GNU IceCat native on Wayland.
-%endif
%prep
%autosetup -N -n %{name}-%{version}
@@ -739,27 +736,19 @@ done
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE14}
-# set up the IceCat start script
-%if 0%{?wayland_backend_default}
-%global wayland_default true
-%else
-%global wayland_default false
-%endif
-
rm -rf $RPM_BUILD_ROOT%{_bindir}/%{name}
%{__sed} -e 's/__DEFAULT_WAYLAND__/%{wayland_default}/' \
-e 's,/__PREFIX__,%{_prefix},g' %{SOURCE13} > %{buildroot}%{_bindir}/%{name}
chmod 755 %{buildroot}%{_bindir}/%{name}
-%if 0%{?wayland_backend_default}
%{__sed} -e 's,/__PREFIX__,%{_prefix},g' %{SOURCE15} >
%{buildroot}%{_bindir}/%{name}-x11
chmod 755 %{buildroot}%{_bindir}/%{name}-x11
desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE16}
-%else
+
%{__sed} -e 's,/__PREFIX__,%{_prefix},g' %{SOURCE12} >
%{buildroot}%{_bindir}/%{name}-wayland
chmod 755 %{buildroot}%{_bindir}/%{name}-wayland
desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE9}
-%endif
+
#
##Install man page
@@ -897,17 +886,19 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/*.desktop
%dir %{langpackdir}
%endif
-%if 0%{?wayland_backend_default}
%files x11
%{_bindir}/%{name}-x11
%{_datadir}/applications/%{name}-x11.desktop
-%else
+
%files wayland
%{_bindir}/%{name}-wayland
%{_datadir}/applications/%{name}-wayland.desktop
-%endif
%changelog
+* Sat Dec 26 2020 Antonio Trande <sagitter(a)fedoraproject.org> - 78.6.0-6.rh1
+- Use wayland/x11 launchers
+- Test ARM build with gcc-11.0.0-0.11
+
* Tue Dec 22 2020 Antonio Trande <sagitter(a)fedoraproject.org> - 78.6.0-5.rh1
- Add __requires_exclude_from