thunderbird-91.3.0-1

t/thunderbird/thunderbird-vl.spec

@@ -6,7 +6,7 @@
 Summary:	Thunderbird Community Edition, Mail/newsgroup client
 Summary(ja):	Thunderbirdコミュニティエディション, メール・ニュースクライアント
 Name:		thunderbird
-Version:	78.14.0
+Version:	91.3.0
 Release:	1%{?_dist_release}
 Group:		internet,communication
 Vendor:		Project Vine
@@ -28,7 +28,7 @@ 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.svg
-Source99:	cbindgen-vendor-0.14.3.tar.xz
+Source99:	cbindgen-vendor.tar.xz
 Source100:  find-external-requires
 
 # for newer rust
@@ -36,7 +36,6 @@ Source100:  find-external-requires
 
 Source1010:	mozconfig-thunderbird-vine6
 Source1020:	mozconfig-thunderbird-vine7
-Source1030:	thunderbird.metainfo.xml
 
 %define tbversion %{version}
 %define version_internal %{version}
@@ -50,17 +49,15 @@ Patch417:       build-aarch64-user_vfp.patch
 Patch418:       mozilla-1512162.patch
 Patch419:       bindgen-d0dfc52706f23db9dc9d74642eeebd89d73cb8d0.patch
 Patch103:       rhbz-1219542-s390-build.patch
-Patch104:       PTHREAD_STACK_MIN.patch
 
 # PPC fix
 Patch304:       mozilla-1245783.patch
-Patch307:       build-disable-elfhack.patch
 
 # Fedora specific patches
 
 # Upstream patches
 Patch402:       mozilla-526293.patch
-Patch406:       mozilla-1170092.patch
+Patch406:        mozilla-1170092.patch
 
 %define desktop_file_utils_version 0.6
 %define nspr_version 4.9
@@ -88,9 +85,7 @@ BuildRequires:	pulseaudio-libs-devel
 BuildRequires:	pixman-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libjpeg-turbo-devel
-BuildRequires:	gtk2-devel
 BuildRequires:	zlib-devel, gzip, zip, unzip
-BuildRequires:	libIDL-devel
 BuildRequires:	freetype2-devel >= %{freetype_version}
 ## disabled libnotify support
 ## see related bug: https://bugzilla.mozilla.org/show_bug.cgi?id=478463
@@ -113,17 +108,14 @@ BuildRequires:	alsa-lib-devel
 BuildRequires:	yasm
 BuildRequires:  nodejs
 BuildRequires:  nasm
-BuildRequires:  autoconf213
+BuildRequires:  m4
 Requires:	sqlite3 >= %{sqlite_version}
 Requires(post):		desktop-file-utils >= %{desktop_file_utils_version}
 Requires(postun):	desktop-file-utils >= %{desktop_file_utils_version}
 
-Provides:       metainfo()
-Provides:       metainfo(thunderbird.metainfo.xml)
-
-AutoProv: 0
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE100}
+# Exclude private libraries from autogenerated provides and requires
+%global __provides_exclude_from ^%{mozappdir}
+%global __requires_exclude ^(%%(find %{buildroot}%{mozappdir} -name '*.so' | xargs -n1 basename | sort -u | paste -s -d '|' -))
 
 %description
 Thunderbird is a standalone mail and newsgroup client.
@@ -143,8 +135,8 @@ Thunderbird はスタンドアローンのメールおよびニュースクラ
 
 %define objdir       objdir
 %define mozappdir    %{_libdir}/%{name}
-%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} 
-%global langpackdir   %{mozappdir}/distribution/extensions
+%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
+%global langpackdir   %{mozappdir}/extensions
 
 #===============================================================================
 
@@ -156,9 +148,6 @@ Thunderbird はスタンドアローンのメールおよびニュースクラ
 %ifarch s390
 %patch103 -p1 -b .rhbz-1219542-s390-build
 %endif
-%patch104 -p1 -b .dynstack
-sed -i -e 's/PTHREAD_STACK_MIN/4096/' \
-	security/sandbox/linux/launch/SandboxLaunch.cpp
 
 %patch304 -p1 -b .1245783
 
@@ -169,14 +158,12 @@ sed -i -e 's/PTHREAD_STACK_MIN/4096/' \
 %ifarch %{arm}
 %patch415 -p1 -b .mozilla-1238661
 %endif
-%patch416 -p1 -b .SIOCGSTAMP
-%patch417 -p1 -b .aarch64-user_vfp
+#%patch416 -p1 -b .SIOCGSTAMP
 %patch418 -p1 -b .mozbz-1512162
 # most likely fixed
 #%patch419 -p1 -b .bindgen
 
 %if 0%{?disable_elfhack}
-%patch307 -p1 -b .elfhack
 %endif
 #cd ..
 
@@ -203,6 +190,9 @@ tar xf %{SOURCE4}
 %{__cp} %{SOURCE44} aurora/content/about-wordmark.svg
 popd
 
+echo "ac_add_options --prefix=\"%{_prefix}\"" >> .mozconfig
+echo "ac_add_options --libdir=\"%{_libdir}\"" >> .mozconfig
+
 echo "ac_add_options --with-system-nspr" >> .mozconfig
 echo "ac_add_options --with-system-nss" >> .mozconfig
 echo "ac_add_options --without-system-icu" >> .mozconfig
@@ -253,7 +243,7 @@ find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';'
 MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \
                 %{__sed} -e 's/-Wall//')
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//')
-MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fno-delete-null-pointer-checks"
+MOZ_OPT_FLAGS=$(echo $MOZ_OPT_FLAGS | %{__sed} -e 's/-Wall//g')
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g0/')
 export MOZ_DEBUG_FLAGS=" "
@@ -278,7 +268,7 @@ export RANLIB="gcc-ranlib"
 MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 %endif
 
-export CFLAGS=`echo $MOZ_OPT_FLAGS |sed -e 's/-fpermissive//g'`
+export CFLAGS=$MOZ_OPT_FLAGS
 export CXXFLAGS=$MOZ_OPT_FLAGS
 export LDFLAGS=$MOZ_LINK_FLAGS
 export RUSTFLAGS="-Cdebuginfo=0"
@@ -296,6 +286,8 @@ MOZ_SMP_FLAGS=-j1
 
 export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
 export STRIP=/bin/true
+export MACH_USE_SYSTEM_PYTHON=1
+export MOZ_NOSPAM=1
 ./mach build
 
 
@@ -312,9 +304,11 @@ cd ..
 
 # install icons
 %{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/icons
-%{__cp} comm/mail/branding/aurora/default16.png \
+%if 0
+ %{__cp} comm/mail/branding/aurora/default16.png \
         $RPM_BUILD_ROOT/%{mozappdir}/icons/
-for s in 16 22 24 32 48 128 256; do
+%endif
+for s in 16 22 24 32 48 64 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
@@ -394,8 +388,8 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
 #
 # See http://www.freedesktop.org/software/appstream/docs/ for more details.
 #
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo
-install -m644 %{SOURCE1030} $RPM_BUILD_ROOT%{_datadir}/metainfo/mozilla-thunderbird.metainfo.xml
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
+%{__cp} -p comm/mail/branding/%{name}/net.thunderbird.Thunderbird.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata/thunderbird.appdata.xml
 
 #install -Dm755 %{SOURCE30} $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
 #%{__sed} -i -e 's|LIBDIR|%{_libdir}|g' $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
@@ -406,28 +400,57 @@ install -m644 %{SOURCE1030} $RPM_BUILD_ROOT%{_datadir}/metainfo/mozilla-thunderb
 
 #===============================================================================
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/thunderbird
 %attr(644,root,root) %{_datadir}/applications/vine-thunderbird.desktop
-%{_datadir}/metainfo/*.xml
+%{_datadir}/appdata/*.xml
 %dir %{_datadir}/mozilla/extensions/%{thunderbird_app_id}
 %dir %{_libdir}/mozilla/extensions/%{thunderbird_app_id}
+%dir %{mozappdir}
+%doc %{mozappdir}/LICENSE
+%{mozappdir}/chrome
+%dir %{mozappdir}/components
+%ghost %{mozappdir}/components/compreg.dat
+%ghost %{mozappdir}/components/xpti.dat
+%{mozappdir}/omni.ja
+%{mozappdir}/plugin-container
+%{mozappdir}/defaults
+%dir %{langpackdir}
+%{mozappdir}/greprefs
+%{mozappdir}/isp
+%{mozappdir}/thunderbird-bin
+%{mozappdir}/thunderbird
+%{mozappdir}/*.so
+%exclude %{mozappdir}/librnp.so
+%{mozappdir}/platform.ini
+%{mozappdir}/application.ini
+%exclude %{mozappdir}/removed-files
 %{_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/64x64/apps/thunderbird.png
 %{_datadir}/icons/hicolor/128x128/apps/thunderbird.png
-%{mozappdir}
 #%{_libdir}/mozilla
+%{mozappdir}/dependentlibs.list
+%{mozappdir}/fonts
+%{mozappdir}/pingsender
 
 #===============================================================================
 
 %changelog
-* Wed Sep 08 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 78.14.0-1
+* Fri Nov 05 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 91.3.0-1
+- new upstream release.
+
+* Thu Aug 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 91.0.2-1
 - new upstream release.
+- updated Source99.
+- updated Patch104.
+- dropped Patch307.
+- imported Patch406 from upstream.
 
 * Thu Aug 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 78.13.0-1
 - new upstream release.