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=75305a43491....
Change:
+%ifarch s390x %{arm} %{power64} aarch64 %{arm} %{ix86}
Thanks.
Full change:
============
commit 75305a43491f81b16b8a1f5eac5b37a112bd95c9
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Sep 20 23:15:41 2018 +0200
Use options to reduce memory requirements at ld runtime on ix86
diff --git a/.gitignore b/.gitignore
index 4e91319..c7e4b81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,4 @@
/icecat-52.8.1-gnu1.tar.bz2
/icecat-52.9.0-gnu1.tar.bz2
/icecat-60.2.0-gnu1.tar.bz2
+/icecat-60.2.0-langpacks.tar.gz
diff --git a/icecat-lang_download.sh b/icecat-lang_download.sh
index cc2193d..6319089 100755
--- a/icecat-lang_download.sh
+++ b/icecat-lang_download.sh
@@ -1,17 +1,18 @@
#!/bin/bash
-URL=http://ftp.gnu.org/gnu/gnuzilla/52.6.0/langpacks/
+VERSION=60.2.0
+URL=http://alpha.gnu.org/gnu/gnuzilla/$VERSION/langpacks/
for u in $URL; do
mkdir -p langpacks && cd langpacks
wget -erobots=off -c -r -l1 -nd -nc -A.xpi -U langpacks $u
-rm -f icecat-52.6.0.ja-JP-mac.langpack.xpi icecat-52.6.0.compare-locales.langpack.xpi
+rm -f icecat-$VERSION.ja-JP-mac.langpack.xpi
icecat-$VERSION.compare-locales.langpack.xpi
done
find . -type f -name '*.xpi' | while read FILE ; do
- newfile="$(echo ${FILE} |sed -e 's/52.3.0.//g' -e
's/icecat-//g')" ;
+ newfile="$(echo ${FILE} |sed -e 's/60.2.0.//g' -e
's/icecat-//g')" ;
mv "${FILE}" "${newfile}" ;
done
cd ..
-tar -zcvf icecat-52.6.0-langpacks.tar.gz langpacks
+tar -zcvf icecat-$VERSION-langpacks.tar.gz langpacks
rm -rf langpacks
exit 0
diff --git a/icecat.spec b/icecat.spec
index 88809c9..58fa167 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -11,7 +11,7 @@
#
##Active/Deactive language files handling
-%global build_langpacks 0
+%global build_langpacks 1
%define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
@@ -81,7 +81,7 @@
Name: icecat
Version: 60.2.0
-Release: 0.2%{?dist}
+Release: 0.1%{?dist}
Summary: GNU version of Firefox browser
## Tri-licensing scheme for Gnuzilla/IceCat in parentheses, and licenses for the
extensions included
@@ -98,7 +98,7 @@ Source2: %{name}.png
Source3: %{name}-mozconfig-common
##Language files downloaded by source7 script
-%if %{build_langpacks}
+%if 0%{build_langpacks}
Source4: %{name}-%{version}-langpacks.tar.gz
%endif
@@ -562,7 +562,7 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e
's/-g/-g1/' -e 's/-O2/-O1/')
# (OOM when linking, rhbz#1238225)
export MOZ_DEBUG_FLAGS=" "
%endif
-%ifarch s390x %{arm} %{power64} aarch64 %{arm}
+%ifarch s390x %{arm} %{power64} aarch64 %{arm} %{ix86}
MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
%endif
%ifarch %{arm}
@@ -588,7 +588,6 @@ MOZ_SMP_FLAGS=-j1
[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8
%endif
-#make -f client.mk build STRIP="/bin/true"
MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" MOZ_OPTIMIZE_FLAGS=" -freorder-blocks
-fno-reorder-functions" MOZ_SERVICES_SYNC="1"
export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
export MOZ_SERVICES_SYNC="1"
export MOZ_OPTIMIZE_FLAGS=" -freorder-blocks -fno-reorder-functions"
@@ -631,7 +630,7 @@ pref("general.useragent.locale",
"chrome://global/locale/intl.properties");
EOF
##Extract langpacks, make any mods needed, repack the langpack, and install it.
-%if %{build_langpacks}
+%if 0%{build_langpacks}
echo > %{name}.lang
mkdir -p $RPM_BUILD_ROOT%{langpackdir}
tar xf %{SOURCE4}
@@ -713,7 +712,7 @@ end
%check
appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/*.appdata.xml
-%if %{build_langpacks}
+%if 0%{build_langpacks}
%files -f %{name}.lang
%else
%files
@@ -755,13 +754,13 @@ appstream-util validate-relax --nonet
$RPM_BUILD_ROOT%{_metainfodir}/*.appdata.x
%endif
%changelog
-* Thu Sep 20 2018 Antonio Trande <sagitterATfedoraproject.org> - 60.2.0-0.2
-- Manpage updated
-
* Fri Sep 14 2018 Antonio Trande <sagitterATfedoraproject.org> - 60.2.0-0.1
- Pre-release 60.2.0
- Integrate firefox patches for wayland (disabled)
-- Setting of upstream patches for ESR60
+- Setting of upstream patches for ESR60
+- Manpage updated
+- Include languages
+- Use options to reduce memory requirements at ld runtime on ix86
* Sun Aug 05 2018 Antonio Trande <sagitterATfedoraproject.org> - 52.9.0-1
- Update to 52.9.0
diff --git a/sources b/sources
index 3269786..9e74f49 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
SHA512 (icecat-60.2.0-gnu1.tar.bz2) =
f3030aaefe98adbff092d9281577bbad61f165905d017b2d73c2eae9f43967546c15a71c1f43e086d6bdd026a40d795abaf59da83f249ef4aaed7de712f263b1
+SHA512 (icecat-60.2.0-langpacks.tar.gz) =
a7e44573d7e7c23902621409879900947b87aa9afa278dd58015d3883b83f0aa545dcee90bcedc39d7496fea69b9b5562ccc6bac3705025cc467c9185ab8af49
SHA512 (icecat-COPYING-licensefiles.tar.gz) =
ed541845170f1d209e322b0def3248d571e0c42c4a17c74e83197e743bd8a128a1475f5312d905c8e70d047eddeac17e604373892eb6d5f1720c5c361849c42c