From 8c429e5430640c66a3d7bf1e245bc845badee003 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Fri, 6 Nov 2020 14:38:35 +0100 Subject: Re-enable s390x buils by backporting a change from Thunderbird https://src.fedoraproject.org/rpms/thunderbird/c/5f0bec1b5b79e117cc469710afbfa4d008af9c29?branch=master --- firefox.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'firefox.spec') diff --git a/firefox.spec b/firefox.spec index 60cc483..11e5d3a 100644 --- a/firefox.spec +++ b/firefox.spec @@ -7,9 +7,6 @@ %global create_debuginfo 1 %global system_nss 1 -# Disabled due to https://bugzilla.redhat.com/show_bug.cgi?id=1886672 -ExcludeArch: s390x - %ifarch armv7hl %global create_debuginfo 0 %endif @@ -121,7 +118,7 @@ ExcludeArch: s390x Summary: Mozilla Firefox Web browser Name: firefox Version: 82.0.2 -Release: 5%{?pre_tag}%{?dist} +Release: 6%{?pre_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz @@ -190,6 +187,7 @@ Patch414: mozilla-1656727.patch Patch415: mozilla-1670333.patch Patch416: mozilla-1673202.patch Patch417: mozilla-1673313.patch +Patch418: mozilla-1556931-s390x-hidden-syms.patch # Wayland specific upstream patches Patch574: firefox-pipewire-0-2.patch @@ -403,6 +401,7 @@ This package contains results of tests executed during build. %patch416 -p1 -b .1673202 %endif %patch417 -p1 -b .1673313 +%patch418 -p1 -b .1556931-s390x-hidden-syms # Wayland specific upstream patches %if 0%{?fedora} > 31 || 0%{?eln} @@ -977,6 +976,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Fri Nov 6 2020 Tomas Popela - 82.0.2-6 +- Re-enable s390x buils by backporting a change from Thunderbird + https://src.fedoraproject.org/rpms/thunderbird/c/5f0bec1b5b79e117cc469710afbfa4d008af9c29?branch=master + * Tue Nov 3 2020 Martin Stransky - 82.0.2-5 - Added mozilla-openh264 dependency to play H264 clips out of the box - Updated Firefox tests -- cgit From 38402af519b3d4de1debf0202283c7d567cd6229 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 9 Nov 2020 08:24:23 +0100 Subject: Exclude s390x as it still fails to build There are still some other problems, see https://koji.fedoraproject.org/koji/taskinfo?taskID=55048351 --- firefox.spec | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'firefox.spec') diff --git a/firefox.spec b/firefox.spec index 11e5d3a..e2ac7f1 100644 --- a/firefox.spec +++ b/firefox.spec @@ -7,6 +7,10 @@ %global create_debuginfo 1 %global system_nss 1 +# There are still build problems on s390x, see +# https://koji.fedoraproject.org/koji/taskinfo?taskID=55048351 +ExcludeArch: s390x + %ifarch armv7hl %global create_debuginfo 0 %endif -- cgit From 83a10190cb5efe6d3d4221636347d9d94cc42b8c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 9 Nov 2020 12:23:30 +0100 Subject: Include date in appdata release tags Otherwise flatpak ignores them. --- firefox.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'firefox.spec') diff --git a/firefox.spec b/firefox.spec index e2ac7f1..f0e1fc5 100644 --- a/firefox.spec +++ b/firefox.spec @@ -122,7 +122,7 @@ ExcludeArch: s390x Summary: Mozilla Firefox Web browser Name: firefox Version: 82.0.2 -Release: 6%{?pre_tag}%{?dist} +Release: 7%{?pre_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz @@ -861,7 +861,9 @@ sed -i -e "s/\[Crash Reporter\]/[Crash Reporter]\nEnabled=1/" %{buildroot}/%{moz # Install appdata file mkdir -p %{buildroot}%{_datadir}/metainfo -%{__sed} -e 's/__VERSION__/%{version}/' %{SOURCE33} > %{buildroot}%{_datadir}/metainfo/firefox.appdata.xml +%{__sed} -e "s/__VERSION__/%{version}/" \ + -e "s/__DATE__/$(date '+%F')/" \ + %{SOURCE33} > %{buildroot}%{_datadir}/metainfo/firefox.appdata.xml # Install Gnome search provider files mkdir -p %{buildroot}%{_datadir}/gnome-shell/search-providers @@ -980,6 +982,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Mon Nov 09 2020 Kalev Lember - 82.0.2-7 +- Include date in appdata release tags + * Fri Nov 6 2020 Tomas Popela - 82.0.2-6 - Re-enable s390x buils by backporting a change from Thunderbird https://src.fedoraproject.org/rpms/thunderbird/c/5f0bec1b5b79e117cc469710afbfa4d008af9c29?branch=master -- cgit