thunderbird-60.3.3-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11982 ec354946-7b23-47d6-9f5a-488ba84defc7

t/thunderbird/mozconfig-thunderbird-vine7

@@ -1,62 +1,37 @@
 mk_add_options MOZ_CO_PROJECT=mail
-ac_add_options --enable-application=mail
-#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir-tb
+ac_add_options --enable-application=comm/mail
 mk_add_options AUTOCONF=autoconf-2.13
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
+
+ac_add_options --enable-default-toolkit=cairo-gtk3
 
 ac_add_options --prefix="$PREFIX"
 ac_add_options --libdir="$LIBDIR"
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
-# thunderbird requires libpng with apng support,
-# so we can not use system-provided png library.
-# (2010/06/13 K.Harada)
-#ac_add_options --with-system-png
-#ac_add_options --with-system-nspr
-#ac_add_options --with-system-nss
-# disabled (2012/04/28 Takemikaduchi)
-#ac_add_options --enable-system-cairo
+#ac_add_options --with-system-libvpx
 ac_add_options --with-pthreads
 ac_add_options --disable-tests
+ac_add_options --disable-strip
+ac_add_options --disable-necko-wifi
+ac_add_options --disable-updater
+ac_add_options --enable-startup-notification
+ac_add_options --enable-pie
+ac_add_options --with-system-icu
+ac_add_options --disable-tests
 ac_add_options --disable-debug
 ac_add_options --disable-debug-symbols
-ac_add_options --enable-jsd
-ac_add_options --disable-installer
-ac_add_options --enable-optimize
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --enable-pango
-ac_add_options --enable-xinerama
-ac_add_options --enable-crypto
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --disable-xprint
-ac_add_options --disable-strip
+ac_add_options --enable-optimize="-O2"
 ac_add_options --disable-official-branding
-ac_add_options --disable-install-strip
-#ac_add_options --enable-install-strip
-# hunspell is in plus category for vine (2010/07/23 K.Harada)
-ac_add_options --disable-system-hunspell
 ac_add_options --disable-crashreporter
-ac_add_options --disable-necko-wifi
-ac_add_options --disable-updater
-ac_add_options --disable-installer
-ac_add_options --disable-gnomevfs
-ac_add_options --enable-gio
-ac_add_options --disable-pedantic
-ac_add_options --disable-auto-deps
-ac_add_options --disable-md
-ac_add_options --disable-elf-hack
 
-# cat not build with xulrunner (yet)  (2010/06/13 K.Harada)
-#ac_add_options --enable-libxul
-#ac_add_options --with-system-libxul
-#ac_add_options --disable-ldap
-ac_add_options --with-branding=mail/branding/aurora
+ac_add_options --with-branding=comm/mail/branding/aurora
 ac_add_options --with-distribution-id=org.vinelinux
 
-#ac_add_options --with-l10n-base=../../l10n
+# lightning related
+ac_add_options --enable-calendar
 
-# disabled libnotify support  (2010/07/03 K.Harada)
-# see related bug: https://bugzilla.mozilla.org/show_bug.cgi?id=478463
-# ac_add_options --disable-libnotify
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir

t/thunderbird/thunderbird-vl.spec

@@ -1,5 +1,7 @@
+%bcond_without clang
+
 # do not include minor version number in MOZILLA_FIVE_HOME
-%define tbmajor 45.2.0
+%define tbmajor 60.3.3
 #%define tbversion %{tbmajor}.10
 %define tbversion %{tbmajor}
 %define tbrelease 1%{?_dist_release}
@@ -12,10 +14,11 @@
 %define tarballdir .
 #define tarballdir comm-esr38
 
-%define mozappdir %{_libdir}/%{name}-%{version_internal}
-%define moz_objdir objdir-tb
+%define objdir       objdir
+%define mozappdir    %{_libdir}/%{name}
 %define version_internal %{tbmajor}
 %define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} 
+%global langpackdir   %{mozappdir}/distribution/extensions
 
 %define desktop_file_utils_version 0.6
 %define nspr_version 4.9
@@ -45,9 +48,10 @@ License:	MPL
 Group:		Applications/Internet
 
 Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/%{tbversion}/source/thunderbird-%{version}.source.tar.xz
-Source1:	ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/%{tbversion}/linux-x86_64/xpi/ja.xpi
-# from https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/6.0/source/thunderbird-6.0.source.tar.bz2
-Source2:	thunderbird-legacy-aurora.tar.xz
+Source1:	thunderbird-langpacks-%{version}-20181205.tar.xz
+Source2:	lightning-langpacks-%{version}.tar.xz
+Source3:	get-calendar-langpacks.sh
+Source4:	thunderbird-legacy-aurora.tar.xz
 Source12:	thunderbird-vine-default-prefs.js
 Source20:	thunderbird.desktop
 Source21:	thunderbird.vine.sh.in
@@ -56,37 +60,28 @@ Source40:	thunderbird-unofficial-branding-tb-brand.properties
 Source41:	thunderbird-unofficial-branding-tb-brand.dtd
 Source42:	thunderbird-unofficial-branding-tb-ja-brand.properties
 Source43:	thunderbird-unofficial-branding-tb-ja-brand.dtd
-Source44:	tb-about-wordmark.png
+Source44:	tb-about-wordmark.svg
 Source100:  find-external-requires
 Source1010:	mozconfig-thunderbird-vine6
 Source1020:	mozconfig-thunderbird-vine7
 
-# locale sources
-#%define MOZ_BUILD_LOCALES "ja"
-# get from mercurial repository with command, 
-# mkdir l10n
-# hg clone http://hg.mozilla.org/releases/l10n-mozilla-1.9.2/ja l10n/ja
-#Source1000:     thunderbird-%{tbversion}-ja.tar.bz2
-
-
 # upstream patch
 
-# Fix for version issues
-Patch0:         thunderbird-version.patch
-
-# customization patches
-Patch1:		thunderbird-38.1.0-default-a4-paper.patch
-
+# Mozilla (XULRunner) patches
+Patch37:        build-jit-atomic-always-lucky.patch
+Patch307:       build-disable-elfhack.patch
+Patch417:       bug1375074-save-restore-x28.patch
 
-# Linux specific
-Patch100:	thunderbird-38.0.1-enable-addons.patch
+# Fedora specific patches
+Patch310:       disable-dbus-remote.patch
+Patch312:       thunderbird-dbus-remote.patch
 
-# Vine Patch
-Patch2000:	thunderbird-45.1.1-vine6.patch
-Patch2001:	thunderbird-31.0-client_mk_objdir.patch
-Patch2002:	thunderbird-45.1.0-mozbuild.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
+%if %{with clang}
+BuildRequires:  clang-devel, lld, llvm-devel
+%endif
+BuildRequires:  rust, cargo
 BuildRequires:	pango-devel
 BuildRequires:	cairo-devel >= %{cairo_version}
 %if %{build_vine7}
@@ -155,16 +150,21 @@ Thunderbird はスタンドアローンのメールおよびニュースクラ
 #===============================================================================
 
 %prep
-#setup -q %{name}-%{version} -c
 %setup -q
 cd %{tarballdir}
 
-# Fix for version issue
-sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
-    > version.patch
-%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
+# Mozilla (XULRunner) patches
+#cd mozilla
+
+%patch310 -p1 -b .disable-dbus-remote
+
+%patch37 -p1 -b .jit-atomic-lucky
+%patch417 -p1 -b .bug1375074-save-restore-x28
+
+%patch307 -p1 -b .elfhack
 
-#patch1 -p1 -b .default-a4
+# TODO - needs fixes
+%patch312 -p1 -b .thunderbird-dbus-remote
 
 %{__rm} -f .mozconfig
 %if %{build_vine6}
@@ -175,17 +175,21 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
 %endif
 
 # setup legacy aurora branding name
-tar xJf %{SOURCE2} 
-%{__cp} %{SOURCE40} mail/branding/aurora/locales/en-US/brand.properties
-%{__cp} %{SOURCE41} mail/branding/aurora/locales/en-US/brand.dtd
-%{__cp} %{SOURCE44} mail/branding/aurora/content/about-wordmark.png
-
-%patch100 -p1 -b .addons
-%if %{build_vine6}
-%patch2000 -p1 -b .vine
+pushd comm/mail/branding/
+tar xf %{SOURCE4} 
+%{__cp} %{SOURCE40} aurora/locales/en-US/brand.properties
+%{__cp} %{SOURCE41} aurora/locales/en-US/brand.dtd
+%{__cp} %{SOURCE44} aurora/content/about-wordmark.svg
+popd
+
+echo "ac_add_options --without-system-nspr" >> .mozconfig
+echo "ac_add_options --without-system-nss" >> .mozconfig
+echo "ac_add_options --disable-system-sqlite" >> .mozconfig
+echo "ac_add_options --without-system-icu" >> .mozconfig
+
+%if %{with clang}
+echo "ac_add_options --enable-linker=lld" >> .mozconfig
 %endif
-%patch2001 -p1 -b .vine
-%patch2002 -p1 -b .vine
 
 #===============================================================================
 
@@ -196,29 +200,30 @@ autoconf-2.13
 INTERNAL_GECKO=%{version_internal}
 MOZ_APP_DIR=%{mozappdir}
 
+# Update the various config.guess to upstream release for aarch64 support
+find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';'
+
+MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \
+                      %{__sed} -e 's/-Wall//')
+#rhbz#1037353
+MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security"
 
-#%if %{build_vine7}
-#MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %__sed -e 's/-Wall//')
-#%else
-#%ifarch x86_64
-##MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %__sed -e 's/-O2/-Os/' -e 's/-Wall//')
-#MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %__sed -e 's/-O2//' -e 's/-Wall//')
-#%else
-#MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %__sed -e 's/-Wall//')
-#%endif
-#%endif
-
-MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | \
-				%{__sed} -e 's/-Wall//')
-export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
-export CFLAGS="$RPM_OPT_FLAGS"
-#export CFLAGS=""
-export CXXFLAGS="$CFLAGS"
-export MOZ_APP_DISPLAYNAME="Tb for Vine Linux"
+export CFLAGS=`echo $MOZ_OPT_FLAGS |sed -e 's/-fpermissive//g'`
+export CXXFLAGS=$MOZ_OPT_FLAGS
+export LDFLAGS=$MOZ_LINK_FLAGS
 
 export PREFIX='%{_prefix}'
 export LIBDIR='%{_libdir}'
 
+%if %{with clang}
+export CC=clang
+export CXX=clang++
+export LLVM_PROFDATA="llvm-profdata"
+export AR="llvm-ar"
+export NM="llvm-nm"
+export RANLIB="llvm-ranlib"
+%endif
+
 MOZ_SMP_FLAGS=-j1
 # On x86 architectures, Mozilla can build up to 4 jobs at once in parallel,
 # however builds tend to fail on other arches when building in parallel.
@@ -230,77 +235,44 @@ MOZ_SMP_FLAGS=-j1
 [ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8
  %endif
 
-export LDFLAGS="-Wl,-rpath,%{ffdir}"
-%__make -f client.mk build STRIP="/bin/true" \
-                           MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
+export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
+export STRIP=/bin/true
+./mach build
 
-## build locales
-#LOCALEDIRS=`find . -print | grep 'locales/Makefile$' | \
-#            sed -e 's|\./\(.*\)/locales/.*|\1|g'`
-#for dir in $LOCALEDIRS
-#do
-#  for lang in %{MOZ_BUILD_LOCALES} ; do
-#    make -C $dir/locales AB_CD=$lang
-#  done
-#done
 
 #===============================================================================
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-cd %{tarballdir}
-
-INTERNAL_GECKO=%{version_internal}
-
-INTERNAL_APP_NAME=%{name}-${INTERNAL_GECKO}
-MOZ_APP_DIR=%{_libdir}/${INTERNAL_APP_NAME}
+cd %{objdir}
 
-cd %{moz_objdir}
 DESTDIR=$RPM_BUILD_ROOT make install
 
-# install unofficial icons
-cd -
+cd ..
 
+# install icons
 %{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/icons
-%{__cp} mail/branding/aurora/mailicon16.png \
+%{__cp} comm/mail/branding/aurora/default16.png \
         $RPM_BUILD_ROOT/%{mozappdir}/icons/
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
-%{__cp} mail/branding/aurora/mailicon16.png \
-        $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/thunderbird.png
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/22x22/apps
-%{__cp} mail/branding/aurora/mailicon22.png \
-        $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/22x22/apps/thunderbird.png
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps
-%{__cp} mail/branding/aurora/mailicon24.png \
-        $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/thunderbird.png
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-%{__cp} mail/branding/aurora/mailicon32.png \
-        $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/thunderbird.png
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-%{__cp} mail/branding/aurora/mailicon48.png \
-        $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/thunderbird.png
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps
-%{__cp} mail/branding/aurora/mailicon256.png \
-        $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps/thunderbird.png
+for s in 16 22 24 32 48 128 256; do
+    %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps
+    %{__cp} -p comm/mail/branding/aurora/default${s}.png \
+               $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/thunderbird.png
+done
 
 desktop-file-install --vendor vine \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE20}
 
 # set up the thunderbird start script
 rm -f $RPM_BUILD_ROOT/%{_bindir}/thunderbird
-%{__cat} %{SOURCE21} | %{__sed} -e 's,TBDIR,%{mozappdir},g' > \
-  $RPM_BUILD_ROOT%{_bindir}/thunderbird
+%{__cat} %{SOURCE21} > $RPM_BUILD_ROOT%{_bindir}/thunderbird
 %{__chmod} 755 $RPM_BUILD_ROOT/%{_bindir}/thunderbird
 
-install -Dm755 %{SOURCE30} $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
-%{__sed} -i -e 's|LIBDIR|%{_libdir}|g' $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
-
-%{__cat} %{SOURCE12} | %{__sed} -e 's,THUNDERBIRD_RPM_VR,%{version}-%{release},g' \
-                                -e 's,COMMAND,%{mozappdir}/open-browser.sh,g' > \
-        $RPM_BUILD_ROOT/vine-default-prefs
-%{__install} -D $RPM_BUILD_ROOT/vine-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/greprefs/all-vine.js
-%{__install} -D $RPM_BUILD_ROOT/vine-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/all-vine.js
-%{__rm} $RPM_BUILD_ROOT/vine-default-prefs
+# set up our default preferences
+%{__cat} %{SOURCE12} | %{__sed} -e 's,THUNDERBIRD_RPM_VR,%{tbversion}-%{release},g' > vine-default-prefs
+%{__install} -D vine-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/greprefs/all-vine.js
+%{__install} -D vine-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/all-vine.js
+%{__rm} vine-default-prefs
 
 %{__rm} -f $RPM_BUILD_ROOT%{_bindir}/thunderbird-config
 
@@ -311,28 +283,105 @@ install -Dm755 %{SOURCE30} $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/mozilla/extensions/%{thunderbird_app_id}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{thunderbird_app_id}
 
-# install locales
-#for lang in %{MOZ_BUILD_LOCALES} ; do
-#  %{__install} -p -D -m 664 %{moz_objdir}/objdir-tb/mozilla/dist/bin/chrome/$lang.{jar,manifest} $RPM_BUILD_ROOT%{mozappdir}/chrome/
-#done
+# Install langpacks
+%{__rm} -f %{name}.lang # Delete for --short-circuit option
+touch %{name}.lang
+
+%{__mkdir_p} %{buildroot}%{langpackdir}
+%{__tar} xf %{SOURCE1}
+for langpack in `ls thunderbird-langpacks/*.xpi`; do
+  language=`basename $langpack .xpi`
+  extensionID=langpack-$language@thunderbird.mozilla.org
+  %{__mkdir_p} $extensionID
+  unzip -qq $langpack -d $extensionID
+
+  destdir=$extensionID/chrome/$language/locale/$language/branding
+  if [ $language != "ja" ]; then
+    %{__cp} %{SOURCE40} $destdir/brand.properties
+    %{__cp} %{SOURCE41} $destdir/brand.dtd
+  else
+    %{__cp} %{SOURCE42} $destdir/brand.properties
+    %{__cp} %{SOURCE43} $destdir/brand.dtd
+  fi
+
+  find $extensionID -type f | xargs chmod 644
+
+  cd $extensionID
+  zip -qq -r9mX ../${extensionID}.xpi *
+  cd -
+
+  %{__install} -m 644 ${extensionID}.xpi %{buildroot}%{langpackdir}
+  language=`echo $language | sed -e 's/-/_/g'`
+  echo "%%lang($language) %{langpackdir}/${extensionID}.xpi" >> %{name}.lang
+done
+%{__rm} -rf thunderbird-langpacks
+
+# lightning langpacks install
+cd %{buildroot}%{langpackdir}
+%{__tar} xf %{SOURCE2}
+chmod a+r *.xpi
+cd -
 
-# install ja.xpi to langpacks directory
-#%{__mkdir_p} $RPM_BUILD_ROOT/%{mozappdir}/langpacks/langpack-ja@thunderbird.mozilla.org
-#unzip %{SOURCE1} -d $RPM_BUILD_ROOT/%{mozappdir}/langpacks/langpack-ja@thunderbird.mozilla.org
-# also setup unofficial branding name
-#%{__cp} %{SOURCE42} $RPM_BUILD_ROOT/%{mozappdir}/langpacks/langpack-ja@thunderbird.mozilla.org/chrome/ja/locale/ja/branding/brand.properties
-#%{__cp} %{SOURCE43} $RPM_BUILD_ROOT/%{mozappdir}/langpacks/langpack-ja@thunderbird.mozilla.org/chrome/ja/locale/ja/branding/brand.dtd
 
-# install ja.xpi to langpack file
-%{__mkdir_p} lang_tmp
-unzip %{SOURCE1} -d lang_tmp
-# also setup unofficial branding name
-%{__cp} %{SOURCE42} lang_tmp/chrome/ja/locale/ja/branding/brand.properties
-%{__cp} %{SOURCE43} lang_tmp/chrome/ja/locale/ja/branding/brand.dtd
+# Get rid of devel package and its debugsymbols
+%{__rm} -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-devel-%{tb_version}
 
-%{__mkdir_p} -p $RPM_BUILD_ROOT%{mozappdir}/langpacks
-cd lang_tmp; \
-zip -r $RPM_BUILD_ROOT%{mozappdir}/langpacks/langpack-ja@thunderbird.mozilla.org.xpi chrome chrome.manifest install.rdf
+# Copy over the LICENSE
+install -c -m 644 LICENSE $RPM_BUILD_ROOT%{mozappdir}
+
+# ghost files
+%{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/components
+touch $RPM_BUILD_ROOT%{mozappdir}/components/compreg.dat
+touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
+
+# Register as an application to be visible in the software center
+#
+# NOTE: It would be *awesome* if this file was maintained by the upstream
+# project, translated and installed into the right place during `make install`.
+#
+# See http://www.freedesktop.org/software/appstream/docs/ for more details.
+#
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
+cat > $RPM_BUILD_ROOT%{_datadir}/appdata/mozilla-thunderbird.appdata.xml <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
+<!--
+BugReportURL: https://bugzilla.mozilla.org/show_bug.cgi?id=1071065
+SentUpstream: 2014-09-22
+-->
+<application>
+  <id type="desktop">mozilla-thunderbird.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <description>
+    <p>
+      Thunderbird is an email client that allows you to read, write and organise all
+      of your email messages. It is compatible with most email accounts, including the
+      most popular webmail services.
+    </p>
+    <p>
+      Thunderbird is designed by Mozilla, a global community working together to make
+      the Internet better. Mozilla believe that the Internet should be open, public,
+      and accessible to everyone without any restrictions.
+    </p>
+    <ul>
+      <li>Easier than ever to set up a new e-mail account</li>
+      <li>Awesome search allows you to find your messages fast</li>
+      <li>Thousands of add-ons give you the freedom to make Thunderbird your own</li>
+    </ul>
+  </description>
+  <url type="homepage">http://www.mozilla.org/thunderbird/</url>
+  <screenshots>
+    <screenshot type="default">https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/mozilla-thunderbird/a.png</screenshot>
+  </screenshots>
+  <!-- FIXME: change this to an upstream email address for spec updates
+  <updatecontact>someone_who_cares@upstream_project.org</updatecontact>
+   -->
+</application>
+EOF
+
+
+#install -Dm755 %{SOURCE30} $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
+#%{__sed} -i -e 's|LIBDIR|%{_libdir}|g' $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
 
 
 %clean
@@ -343,38 +392,47 @@ zip -r $RPM_BUILD_ROOT%{mozappdir}/langpacks/langpack-ja@thunderbird.mozilla.org
 %post
 update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
 
 %postun
 update-desktop-database &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor
+if [ $1 -eq 0 -a -x %{_bindir}/gtk-update-icon-cache ]; then
+  touch --no-create %{_datadir}/icons/hicolor
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%posttrans
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
+#===============================================================================
 
 %files
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/thunderbird
 %attr(644,root,root) %{_datadir}/applications/vine-thunderbird.desktop
+%{_datadir}/appdata/*.appdata.xml
+%dir %{_datadir}/mozilla/extensions/%{thunderbird_app_id}
+%dir %{_libdir}/mozilla/extensions/%{thunderbird_app_id}
 %{_datadir}/icons/hicolor/16x16/apps/thunderbird.png
 %{_datadir}/icons/hicolor/22x22/apps/thunderbird.png
 %{_datadir}/icons/hicolor/24x24/apps/thunderbird.png
 %{_datadir}/icons/hicolor/256x256/apps/thunderbird.png
 %{_datadir}/icons/hicolor/32x32/apps/thunderbird.png
 %{_datadir}/icons/hicolor/48x48/apps/thunderbird.png
+%{_datadir}/icons/hicolor/128x128/apps/thunderbird.png
 %{mozappdir}
 #%{_libdir}/mozilla
-%exclude %{_libdir}/%{name}-%{version_internal}/removed-files
-%exclude %{_datadir}/idl/%{name}-%{version_internal}
-%exclude %{_includedir}/%{name}-%{version_internal}
-%exclude %{_libdir}/%{name}-devel-%{version_internal}
 
 #===============================================================================
 
 %changelog
+* Sun Dec 09 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 60.3.3-1
+- new upstream release.
+- replaced all patches.
+- updated branding files.
+- updated default-preferences.
+
 * Sun Jul 03 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 45.2.0-1
 - new upstream release