From 623455131be0087f5f7783d92bbdfbfc1b9f12d3dad00e4ee6c213be48cff42e Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Thu, 11 Jun 2020 14:54:15 +0000 Subject: [PATCH 1/2] - build with nodejs10 to be able to drop nodejs8 from TW OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=536 --- MozillaThunderbird.changes | 5 +++++ MozillaThunderbird.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index 617b606..22d467b 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 11 14:52:51 UTC 2020 - Wolfgang Rosenauer + +- build with nodejs10 to be able to drop nodejs8 from TW + ------------------------------------------------------------------- Sat Jun 6 21:05:07 UTC 2020 - Andreas Stieger diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index 8d691d5..9ef4751 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -79,7 +79,7 @@ BuildRequires: memory-constraints BuildRequires: mozilla-nspr-devel >= 4.21 BuildRequires: mozilla-nss-devel >= 3.44.4 BuildRequires: nasm >= 2.13 -BuildRequires: nodejs8 >= 8.11 +BuildRequires: nodejs10 >= 10.19.0 BuildRequires: python-devel BuildRequires: python2-xml BuildRequires: python3 >= 3.5 From e65691f980a53456c40f10225c1b06870de4a412fb3e9f02d6c8f6440ac128d6 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Thu, 11 Jun 2020 15:01:14 +0000 Subject: [PATCH 2/2] - updated create-tar.sh OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=537 --- MozillaThunderbird.changes | 1 + MozillaThunderbird.spec | 4 ++-- create-tar.sh | 5 +---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index 22d467b..92a8d3f 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -2,6 +2,7 @@ Thu Jun 11 14:52:51 UTC 2020 - Wolfgang Rosenauer - build with nodejs10 to be able to drop nodejs8 from TW +- updated create-tar.sh ------------------------------------------------------------------- Sat Jun 6 21:05:07 UTC 2020 - Andreas Stieger diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index 9ef4751..3a0d1b4 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -62,7 +62,7 @@ Name: %{pkgname} BuildRequires: Mesa-devel BuildRequires: alsa-devel BuildRequires: autoconf213 -BuildRequires: dbus-1-glib-devel >= 0.60 +BuildRequires: dbus-1-glib-devel BuildRequires: fdupes %if 0%{?suse_version} <= 1320 BuildRequires: gcc7-c++ @@ -144,7 +144,7 @@ Source4: tar_stamps Source6: suse-default-prefs.js Source7: l10n-%{version}.tar.xz Source9: thunderbird.appdata.xml -Source14: https://github.com/openSUSE/firefox-scripts/raw/8a54002/create-tar.sh +Source14: https://github.com/openSUSE/firefox-scripts/raw/5e54f4a/create-tar.sh Source20: https://ftp.mozilla.org/pub/%{progname}/releases/%{orig_version}%{orig_suffix}/source/%{progname}-%{orig_version}%{orig_suffix}.source.tar.xz.asc Source21: https://ftp.mozilla.org/pub/%{progname}/releases/%{orig_version}/KEY#/mozilla.keyring # Gecko/Toolkit diff --git a/create-tar.sh b/create-tar.sh index 4d78dae..1cf654c 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -181,10 +181,7 @@ fi BUILD_ID=$(get_build_number "$VERSION$VERSION_SUFFIX") if [ -z ${SKIP_LOCALES+x} ]; then - # TODO: Thunderbird has usually "default" as locale entry. - # There we probably need to double-check Firefox-locals - # For now, just download every time for Thunderbird - if [ "$PRODUCT" = "firefox" ] && [ "$PREV_VERSION" != "" ] && locales_unchanged "$BUILD_ID"; then + if [ "$PREV_VERSION" != "" ] && locales_unchanged "$BUILD_ID"; then printf "%-40s: Did not change. Skipping.\n" "locales" LOCALES_CHANGED=0 else