Accepting request 813558 from mozilla:Factory

- build with nodejs10 to be able to drop nodejs8 from TW
- updated create-tar.sh

OBS-URL: https://build.opensuse.org/request/show/813558
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaThunderbird?expand=0&rev=233
This commit is contained in:
Dominique Leuenberger 2020-06-14 16:15:05 +00:00 committed by Git OBS Bridge
commit 69737b701e
3 changed files with 10 additions and 7 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jun 11 14:52:51 UTC 2020 - Wolfgang Rosenauer <wr@rosenauer.org>
- 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 <andreas.stieger@gmx.de> Sat Jun 6 21:05:07 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>

View File

@ -62,7 +62,7 @@ Name: %{pkgname}
BuildRequires: Mesa-devel BuildRequires: Mesa-devel
BuildRequires: alsa-devel BuildRequires: alsa-devel
BuildRequires: autoconf213 BuildRequires: autoconf213
BuildRequires: dbus-1-glib-devel >= 0.60 BuildRequires: dbus-1-glib-devel
BuildRequires: fdupes BuildRequires: fdupes
%if 0%{?suse_version} <= 1320 %if 0%{?suse_version} <= 1320
BuildRequires: gcc7-c++ BuildRequires: gcc7-c++
@ -79,7 +79,7 @@ BuildRequires: memory-constraints
BuildRequires: mozilla-nspr-devel >= 4.21 BuildRequires: mozilla-nspr-devel >= 4.21
BuildRequires: mozilla-nss-devel >= 3.44.4 BuildRequires: mozilla-nss-devel >= 3.44.4
BuildRequires: nasm >= 2.13 BuildRequires: nasm >= 2.13
BuildRequires: nodejs8 >= 8.11 BuildRequires: nodejs10 >= 10.19.0
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: python2-xml BuildRequires: python2-xml
BuildRequires: python3 >= 3.5 BuildRequires: python3 >= 3.5
@ -144,7 +144,7 @@ Source4: tar_stamps
Source6: suse-default-prefs.js Source6: suse-default-prefs.js
Source7: l10n-%{version}.tar.xz Source7: l10n-%{version}.tar.xz
Source9: thunderbird.appdata.xml 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 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 Source21: https://ftp.mozilla.org/pub/%{progname}/releases/%{orig_version}/KEY#/mozilla.keyring
# Gecko/Toolkit # Gecko/Toolkit

View File

@ -181,10 +181,7 @@ fi
BUILD_ID=$(get_build_number "$VERSION$VERSION_SUFFIX") BUILD_ID=$(get_build_number "$VERSION$VERSION_SUFFIX")
if [ -z ${SKIP_LOCALES+x} ]; then if [ -z ${SKIP_LOCALES+x} ]; then
# TODO: Thunderbird has usually "default" as locale entry. if [ "$PREV_VERSION" != "" ] && locales_unchanged "$BUILD_ID"; then
# 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
printf "%-40s: Did not change. Skipping.\n" "locales" printf "%-40s: Did not change. Skipping.\n" "locales"
LOCALES_CHANGED=0 LOCALES_CHANGED=0
else else