- update to Thunderbird 52.9 (bsc#1098998)

- correct requires and provides handling (boo#1076907) - reduce memory footprint with %ix86 at linking time via additional compiler flags (boo#1091376) OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=409
2018-07-02 13:49:36 +00:00 · 2018-07-02 13:49:36 +00:00 · 9a9de5cf1f
commit 9a9de5cf1f
parent 07cdaea7b5
11 changed files with 1506 additions and 1528 deletions
--- a/MozillaThunderbird.changes
+++ b/MozillaThunderbird.changes
@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jul  2 12:36:32 UTC 2018 - wr@rosenauer.org
+
+- update to Thunderbird 52.9 (bsc#1098998)
+- correct requires and provides handling (boo#1076907)
+- reduce memory footprint with %ix86 at linking time via additional
+  compiler flags (boo#1091376)
+
 -------------------------------------------------------------------
 Sun Jul  1 12:23:45 UTC 2018 - astieger@suse.com

--- a/MozillaThunderbird.spec
+++ b/MozillaThunderbird.spec
@ -17,9 +17,9 @@
 #


-%define mainversion 52.8.0
+%define mainversion 52.9.0
 %define update_channel release
-%define releasedate 201805170000
+%define releasedate 20180629153814

 %bcond_without mozilla_tb_kde4
 %bcond_with    mozilla_tb_valgrind
@ -96,7 +96,6 @@ Source3:        mozilla.sh.in
 Source4:        l10n-%{version}.tar.xz
 #Source5:        shipped-locales
 Source6:        suse-default-prefs.js
-Source7:        find-external-requires.sh
 Source8:        thunderbird-rpmlintrc
 Source9:        thunderbird.appdata.xml
 Source10:       create-tar.sh
@ -130,10 +129,8 @@ ExcludeArch:    ppc ppc64 s390 s390x
 %define has_system_cairo 0
 %define localize 1
 ### build options end
-%define _use_internal_dependency_generator 0
-%define __find_requires sh %{SOURCE7}
-%global provfind sh -c "grep -v '.so' | %__find_provides"
-%global __find_provides %provfind
+%define __provides_exclude ^lib.*\\.so.*$
+%define __requires_exclude ^(libmoz.*|liblgpllibs.*|libxul.*)$
 Requires:       mozilla-nspr >= %(rpm -q --queryformat '%%{VERSION}' mozilla-nspr)
 Requires:       mozilla-nss >= %(rpm -q --queryformat '%%{VERSION}' mozilla-nss)
 Conflicts:      thunderbird-esr
@ -241,7 +238,7 @@ export CFLAGS="$CFLAGS -fno-delete-null-pointer-checks"
 %ifarch ppc64 ppc64le
 export CFLAGS="$CFLAGS -mminimal-toc"
 %endif
-%ifarch %arm
+%ifarch %ix86 %arm
 # Limit RAM usage during link
 export LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 %endif
@ -276,7 +273,7 @@ ac_add_options --enable-alsa
 %if 0%{?suse_version} > 1320
 ac_add_options --enable-optimize="-g -O2"
 %endif
-%ifarch %ix86 %arm
+%ifarch %arm
 %if 0%{?suse_version} > 1230
 ac_add_options --disable-optimize
 %endif
@ -315,50 +312,36 @@ make -f client.mk build
 cd $RPM_BUILD_DIR/obj
 make -C mail/installer STRIP=/bin/true MOZ_PKG_FATAL_WARNINGS=0
 # copy tree into RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{progdir}
+mkdir -p %{buildroot}%{progdir}
 cp -rf $RPM_BUILD_DIR/obj/dist/thunderbird/* \
-       $RPM_BUILD_ROOT%{progdir}
+       %{buildroot}%{progdir}
 %if %{with mozilla_tb_kde4}
 # install kde.js
-install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{progdir}/defaults/pref/kde.js
+install -m 644 %{SOURCE12} %{buildroot}%{progdir}/defaults/pref/kde.js
 # make sure that instantApply is true by default
 # (TODO: mozilla-kde.patch needs to be improved to really not load kde.js in non-KDE envs)
-echo 'pref("browser.preferences.instantApply", true);' > $RPM_BUILD_ROOT%{progdir}/defaults/pref/all-thunderbird.js
+echo 'pref("browser.preferences.instantApply", true);' > %{buildroot}%{progdir}/defaults/pref/all-thunderbird.js
 %endif
 # build additional locales
 %if %localize
 %if 0%{?SOURCE5:1}
 cp %SOURCE5 ../thunderbird/mail/locales/shipped-locales
 %endif
-rm -f %{_tmppath}/translations.*
-touch %{_tmppath}/translations.{common,other}
-for locale in $(awk '{ print $1; }' ../thunderbird/mail/locales/shipped-locales); do
-  case $locale in
-   ja-JP-mac|en-US)
-        # locales not to be included in translations package
-	;;
-   *)
+truncate -s 0 %{_tmppath}/translations.{common,other}
+sed -r '/^(ja-JP-mac|en-US|$)/d;s/ .*$//' $RPM_BUILD_DIR/thunderbird/mail/locales/shipped-locales \
+    | xargs -P 8 -n 1 -I {} /bin/sh -c '
+	locale=$1
   	pushd $RPM_BUILD_DIR/compare-locales
 	PYTHONPATH=lib \
 	  scripts/compare-locales -m ../l10n-merged/$locale \
 	  ../thunderbird/mail/locales/l10n.ini ../l10n $locale
 	popd
 	LOCALE_MERGEDIR=$RPM_BUILD_DIR/l10n-merged/$locale \
-        make -C mail/locales langpack-$locale || continue
+            make -C mail/locales langpack-$locale
        cp -rL dist/xpi-stage/locale-$locale \
-           $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@thunderbird.mozilla.org
-	# Lightning
-	_shipcalendar=0
-	#for callocale in in $(awk '{ print $1; }' ../thunderbird/calendar/locales/shipped-locales); do
-	#  if [ "$locale" = "$callocale" ]; then
-	#    make -C mail/locales calendar-langpack-$locale || continue
-	#    cp -rL dist/xpi-stage/lightning-$locale \
-	#      $RPM_BUILD_ROOT%{progdir}/extensions/lightning-langpack-$locale@thunderbird.mozilla.org
-	#    _shipcalendar=1
-	#  fi
-	#done
+           %{buildroot}%{progdir}/extensions/langpack-$locale@thunderbird.mozilla.org
 	# remove prefs and profile defaults from langpack
-	rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@thunderbird.mozilla.org/defaults
+	rm -rf %{buildroot}%{progdir}/extensions/langpack-$locale@thunderbird.mozilla.org/defaults
        # check against the fixed common list and sort into the right filelist
        _matched=0
        for _match in ar ca cs da de el en-GB es-AR es-CL es-ES fi fr hu it ja ko nb-NO nl pl pt-BR pt-PT ru sv-SE zh-CN zh-TW; do
@ -367,101 +350,97 @@ for locale in $(awk '{ print $1; }' ../thunderbird/mail/locales/shipped-locales)
        [ $_matched -eq 1 ] && _l10ntarget=common || _l10ntarget=other
 	echo %{progdir}/extensions/langpack-$locale@thunderbird.mozilla.org \
 	  >> %{_tmppath}/translations.$_l10ntarget
-	if [ $_shipcalendar -eq 1 ]; then
-	  echo %{progdir}/extensions/lightning-langpack-$locale@thunderbird.mozilla.org \
-	    >> %{_tmppath}/translations.$_l10ntarget
-	fi
-  esac
-done
+' -- {}
 %endif
 # overwrite the mozilla start-script and link it to /usr/bin
-mkdir --parents $RPM_BUILD_ROOT%{_bindir}/
+mkdir --parents %{buildroot}%{_bindir}/
 sed "s:%%PREFIX:%{_prefix}:g
 s:%%PROGDIR:%{progdir}:g
 s:%%APPNAME:thunderbird:g
 s:%%PROFILE:.thunderbird:g" \
-  %{SOURCE3} > $RPM_BUILD_ROOT%{progdir}/%{progname}.sh
-chmod 755 $RPM_BUILD_ROOT%{progdir}/%{progname}.sh
-ln -sf ../..%{progdir}/%{progname}.sh $RPM_BUILD_ROOT%{_bindir}/%{progname}
+  %{SOURCE3} > %{buildroot}%{progdir}/%{progname}.sh
+chmod 755 %{buildroot}%{progdir}/%{progname}.sh
+ln -sf ../..%{progdir}/%{progname}.sh %{buildroot}%{_bindir}/%{progname}
 # freedesktop definition
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+mkdir -p %{buildroot}%{_datadir}/applications
 install -m 644 %{SOURCE1} \
-               $RPM_BUILD_ROOT%{_datadir}/applications/%{desktop_file_name}.desktop
+               %{buildroot}%{_datadir}/applications/%{desktop_file_name}.desktop
 # appdata
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-cp %{SOURCE9} $RPM_BUILD_ROOT%{_datadir}/appdata/%{desktop_file_name}.appdata.xml
+mkdir -p %{buildroot}%{_datadir}/appdata
+cp %{SOURCE9} %{buildroot}%{_datadir}/appdata/%{desktop_file_name}.appdata.xml
 # apply SUSE defaults
 sed -e 's,RPM_VERSION,%{mainversion},g
 s,GSSAPI,%{libgssapi},g' \
   %{SOURCE6} > suse-default-prefs
-cp suse-default-prefs $RPM_BUILD_ROOT%{progdir}/defaults/pref/all-opensuse.js
+cp suse-default-prefs %{buildroot}%{progdir}/defaults/pref/all-opensuse.js
 rm suse-default-prefs
 # use correct locale for useragent
-cat > $RPM_BUILD_ROOT%{progdir}/defaults/pref/all-l10n.js << EOF
+cat > %{buildroot}%{progdir}/defaults/pref/all-l10n.js << EOF
 pref("general.useragent.locale", "chrome://global/locale/intl.properties");
 EOF
 ##########
 # DEVEL
 #
-mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{progname}
+mkdir -p %{buildroot}%{_includedir}/%{progname}
 chmod a+x dist/sdk/bin/*.py
-cp -rL dist/sdk/bin/*    $RPM_BUILD_ROOT%{_libdir}/%{progname}/
-cp -rL dist/sdk/lib/*.a  $RPM_BUILD_ROOT%{_libdir}/%{progname}/
-cp -rL dist/idl/*        $RPM_BUILD_ROOT%{_includedir}/%{progname}/
-cp -rL dist/include/*    $RPM_BUILD_ROOT%{_includedir}/%{progname}/
-#mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
+cp -rL dist/sdk/bin/*    %{buildroot}%{_libdir}/%{progname}/
+cp -rL dist/sdk/lib/*.a  %{buildroot}%{_libdir}/%{progname}/
+cp -rL dist/idl/*        %{buildroot}%{_includedir}/%{progname}/
+cp -rL dist/include/*    %{buildroot}%{_includedir}/%{progname}/
+#mkdir -p %{buildroot}%{_libdir}/pkgconfig/
 #install -m 755 $RPM_BUILD_DIR/thunderbird/mozilla/build/unix/thunderbird-*.pc \
-#               $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
-#rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/thunderbird-nss.pc
-#ln -sf nss.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/thunderbird-nss.pc
+#               %{buildroot}%{_libdir}/pkgconfig/
+#rm %{buildroot}%{_libdir}/pkgconfig/thunderbird-nss.pc
+#ln -sf nss.pc %{buildroot}%{_libdir}/pkgconfig/thunderbird-nss.pc
 #
 #
 # remove spurious executable bits
-find $RPM_BUILD_ROOT/usr/include/%{progname} -type f -exec chmod a-x {} \;
-find $RPM_BUILD_ROOT%{_libdir}/%{progname}  \
+find %{buildroot}/usr/include/%{progname} -type f -exec chmod a-x {} \;
+find %{buildroot}%{_libdir}/%{progname}  \
    -name "*.js" -o \
    -name "*.jsm" -o \
    -name "*.rdf" -o \
    -name "*.properties" -o \
    -name "*.dtd" -o \
-    -name "*.css" | xargs chmod a-x
+    -name "*.css" \
+    -exec chmod a-x {} +
 # remove mkdir.done files from installed base
 find $RPM_BUILD_ROOT%{progdir} -type f -name ".mkdir.done" -delete -print
 #
 for size in 16 22 24 32 48 256; do
-  mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/
+  mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/
  cp %{buildroot}%{progdir}/chrome/icons/default/default$size.png \
    %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/%{progname}.png
 done
 %suse_update_desktop_file %{desktop_file_name} Network Email GTK
 # excluded files
-rm -f $RPM_BUILD_ROOT%{progdir}/thunderbird
-rm -f $RPM_BUILD_ROOT%{progdir}/removed-files
-rm -f $RPM_BUILD_ROOT%{progdir}/precomplete
-rm -f $RPM_BUILD_ROOT%{progdir}/updater
-rm -f $RPM_BUILD_ROOT%{progdir}/updater.ini
-rm -f $RPM_BUILD_ROOT%{progdir}/update.locale
-rm -f $RPM_BUILD_ROOT%{progdir}/dictionaries/en-US*
-rm -f $RPM_BUILD_ROOT%{progdir}/nspr-config
+rm -f %{buildroot}%{progdir}/thunderbird
+rm -f %{buildroot}%{progdir}/removed-files
+rm -f %{buildroot}%{progdir}/precomplete
+rm -f %{buildroot}%{progdir}/updater
+rm -f %{buildroot}%{progdir}/updater.ini
+rm -f %{buildroot}%{progdir}/update.locale
+rm -f %{buildroot}%{progdir}/dictionaries/en-US*
+rm -f %{buildroot}%{progdir}/nspr-config
 # Some sites use different partitions for /usr/(lib|lib64) and /usr/share.  Since you
 # can't create hardlinks across partitions, we'll do this more than once.
-%fdupes $RPM_BUILD_ROOT%{progdir}
-%fdupes $RPM_BUILD_ROOT%{_libdir}/mozilla
-%fdupes $RPM_BUILD_ROOT%{_datadir}
-%fdupes $RPM_BUILD_ROOT%{_includedir}
+%fdupes %{buildroot}%{progdir}
+%fdupes %{buildroot}%{_libdir}/mozilla
+%fdupes %{buildroot}%{_datadir}
+%fdupes %{buildroot}%{_includedir}
 %if %crashreporter
 SYMBOLS_NAME="thunderbird-%{mainversion}-%{release}.%{_arch}-%{suse_version}-symbols"
 make buildsymbols \
  SYMBOL_INDEX_NAME="$SYMBOLS_NAME.txt" \
  SYMBOL_ARCHIVE_BASENAME="$SYMBOLS_NAME"
 if [ -e dist/*symbols.zip ]; then
-  mkdir -p $RPM_BUILD_ROOT%{_datadir}/mozilla/
-  cp dist/*symbols.zip $RPM_BUILD_ROOT%{_datadir}/mozilla/
+  mkdir -p %{buildroot}%{_datadir}/mozilla/
+  cp dist/*symbols.zip %{buildroot}%{_datadir}/mozilla/
 fi
 %endif

 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 %if %localize
 rm -rf %{_tmppath}/translations.*
 %endif
--- a/2836
+++ b/2836
--- a/SHA512SUMS.asc
+++ b/SHA512SUMS.asc
@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)

-iQIcBAABCAAGBQJa/ipTAAoJELu+vbskxvNVLkcP/0uSbfoS6yqCLquzIxBOnyC+
-FUbIes0/LPyR6BTgyxDrh7CUw4wvsYOQNWcLqm8AookEqeGpmneQkX/WbGe8uzMA
-MokaqLUgj9m8YfzuLHN3aJIJQtufC311YtRhi+gCwmC5fKe6rgEJk2jcKCY1+d8r
-f5QrTqcDdQiTnWO5yQwhbYf5f8xyGwUx6zyB+GHUqqIYpc3ohmHqkZrWhbpYmiKZ
-zcv+HQ/8SycHiFyUZpBL0g5MJ9h8Xup/BDHSoKs5YgRy1sjuYvIqJSw9d85x8t6J
-td2CflCwM96SGoaflsJCztDo7oOegFwzEu9Xc8Aqd7DW6FzCkheNyH9k78bfTdDB
-FeY/GRv1ikpoi3E3y5O+dz2vge7LhYSirUQ1GCmZX28myVkFJMShi51YdhhzSnzH
-OtCb6VNkRxBd1dXueBv2cGuQMnphS/2G+5IhGzapKPEV5utRVuAbVhK3hKtzLngJ
-Fk/B28ncdVvJn7m9iurA89DZGBQPOqRI9PKPPElF1AoHK/9n29j9BZsRMTlTJBBj
-IrGPLgFBY4PEcqoDEYbnlZRhZXf3W1Zv6egdPbjaYnBD7l3gXs66vBj4V7ZPFbzn
-2fNHua1DWytsU98bptIK20He2juuAYgFnBM3NItTw2K/mtI6FBrVDZLC1Mtv8oL2
-jiOPD9+75f/8CvBuQsoP
-=p8W0
+iQIcBAABCAAGBQJbNwBAAAoJELu+vbskxvNV/VIQALm38qMA24JjfEhX6GMRRV3G
+x6VPMSuNwcSI4MMxInsOkZ4onFEqjbHsZd6o3Ty1PLQtQpXfYz+JZRBYEC6+ryLE
+buy2G4y1F0GZp+6hSgjfzFcDDJ/jBvRra0v4QMTZ+0Thgg+gA69WhlxzysWT4zEF
+tgpUx2uIMMhNNkldixuFwqysQhlkzQmj8oRqOZ0o7Q2OkptB/S3YVspAEYkSp881
+MU3vSDGwfNmE6l19lr1CPnuvWyv20tcRFqmo52maG/rCLKarQbNZHyyPrsu3cebK
+IGkz0/aNQFA1n5CdTsJUOq1qsdUHs4+ntrGDY03cvBtj8o8Aexn+0av735Gz/CAI
+MkKUJZ7xSSI+rN83q2TPaRZPYzfeD11zNWvrgrc62Hx7exqSNGjNnNa7aEgZOxZq
+iJbebNnqZDMSIBmWOLHeLRoyaEER3EqqBWzp7OrVl6UP67c5NtPyp+lTAvrZz+YF
+qs21RvMchYxAvToG8akuha4P8qQg5i3c37zeQDSba5MSxR4gKJGu3qSy0tJxHbe0
+gylCvwLW/TDHv/W1o5Cj0RY+dUKpLaJc4ZvrRpx9150psrzO3b90R24UvWfve+tf
+2PQXUQG+LZR6/tbszZ4PObJ7nY2yxNnpZQtGl84Uh4cQ8DyQDEESt0NMaJCin4GD
+0l+nr75NKIw5Ub8iXlz8
+=q2NC
 -----END PGP SIGNATURE-----
--- a/compare-locales.tar.xz
+++ b/compare-locales.tar.xz
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7a4b36c92004f0ff04597a8efd911d4d92b1438c5a3341fb062371834abe32b0
-size 28484
+oid sha256:62148aebed238dd4a9804de0457ba1b8ce077040f1dec2aec989fe43b0bc431c
+size 28396
--- a/create-tar.sh
+++ b/create-tar.sh
@ -2,8 +2,8 @@

 CHANNEL="esr52"
 BRANCH="releases/comm-$CHANNEL"
-RELEASE_TAG="THUNDERBIRD_52_8_0_RELEASE"
-VERSION="52.8.0"
+RELEASE_TAG="THUNDERBIRD_52_9_0_RELEASE"
+VERSION="52.9.0"
 VERSION_SUFFIX=""
 LOCALE_FILE="thunderbird-$VERSION/mail/locales/shipped-locales"

--- a/find-external-requires.sh
+++ b/find-external-requires.sh
@ -1,9 +0,0 @@
-#!/bin/sh
-# Finds requirements provided outside of the current file set
-
-filelist=$( sed "s/[]['\"*?{}]/\\\\\&/g" )
-provides=$( echo "$filelist" | /usr/lib/rpm/find-provides )
-echo "$filelist" \
-    | /usr/lib/rpm/find-requires \
-    | grep -F -v "$provides" \
-    | sort -u
--- a/l10n-52.8.0.tar.xz
+++ b/l10n-52.8.0.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:22da7fdf23587de2464bc7daa3acb14ab4fd056bb451f6e5431ab5616bf3f5a0
-size 26216564
--- a/l10n-52.9.0.tar.xz
+++ b/l10n-52.9.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2196a5c5e79aa7cfef03c9c585404eb26862f6a2dbe547d84b46073f23ac5c6a
+size 26224524
--- a/thunderbird-52.8.0.source.tar.xz
+++ b/thunderbird-52.8.0.source.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:35b9a687997d92f36107090c1217941e5d637760b0efa7d13819cde36894eb59
-size 230380780
--- a/thunderbird-52.9.0.source.tar.xz
+++ b/thunderbird-52.9.0.source.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7301d61b6ab373f6c37a76c3f562596f4ce1ed10ef12c96dd5a60b37e0c1b8dd
+size 230441012