diff --git a/calendar-it.jar b/calendar-it.jar deleted file mode 100644 index 4aeb00f..0000000 Binary files a/calendar-it.jar and /dev/null differ diff --git a/gdata-provider-it.jar b/gdata-provider-it.jar deleted file mode 100644 index fb434b8..0000000 Binary files a/gdata-provider-it.jar and /dev/null differ diff --git a/lightning-it.jar b/lightning-it.jar deleted file mode 100644 index 20110ec..0000000 Binary files a/lightning-it.jar and /dev/null differ diff --git a/thunderbird.spec b/thunderbird.spec index 5810035..d8cadaf 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -1,16 +1,15 @@ %define distroname openmamba %define majversion %(echo %version | cut -d. -f 1-2) %define mozilla_version %(echo %version | cut -d. -f 1) -%define xul_sdk_dir %(pkg-config --variable=sdkdir libxul) %define thunderbird_internal %{majversion} -%define tbdir %{_libdir}/thunderbird-%{majversion} +%define tbdir %{_libdir}/thunderbird #%define enable_debug_info 0 #%define build_langpack 1 #%define with_calendar 0 -%define source_dir comm-esr%(echo %version | cut -d. -f1) +#%define source_dir comm-esr%(echo %version | cut -d. -f1) Name: thunderbird -Version: 38.6.0 +Version: 60.4.0 Release: 1mamba Summary: Mozilla Thunderbird email, RSS, and newsgroup client Group: Graphical Desktop/Applications/Internet @@ -18,7 +17,8 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: http://www.mozilla.org/projects/thunderbird/ -Source0: http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.bz2 +Source0: http://ftp.mozilla.org/pub/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.xz +#http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.bz2 # wget ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/linux-i686/xpi/*.xpi # tar -cj *.xpi > ../thunderbird-%{version}-langpacks.tar.bz2 # or @@ -142,7 +142,9 @@ Because the project is small and tightly managed, bugs targeted to a particular This package contains static libraries and header files need for development. %prep -%setup -q -c -D -T +%setup -q +#-D -T +#:<< ___EOF %define _use_internal_dependency_generator 0 %define __find_provides %{_builddir}/thunderbird-%{version}/find_provides.sh @@ -169,42 +171,27 @@ done _EOF chmod +x %{_builddir}/thunderbird-%{version}/find_requires.sh -:<< ___EOF +#:<< ___EOF -cd %{source_dir} +#%patch4 -p1 -#%patch0 -p1 -#%if %enable_debug_info -#%patch1 -p1 -#%endif -#%patch2 -p1 -#%patch3 -p0 -%patch4 -p1 -#%patch5 -#%patch6 -p1 +#sed -e 's|@DEFAULT_BROWSER@|firefox|' %{PATCH7} | patch -p1 -sed -e 's|@DEFAULT_BROWSER@|firefox|' %{PATCH7} | patch -p1 +#sed -e 's/__RPM_VERSION_INTERNAL__/%{thunderbird_internal}/' %{P:%%PATCH8} \ +#> version.patch +#%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch -sed -e 's/__RPM_VERSION_INTERNAL__/%{thunderbird_internal}/' %{P:%%PATCH8} \ -> version.patch -%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch -#%patch9 -p1 -#%patch10 -#%patch11 -#%patch12 -#%patch13 -p0 -b .os2cc - -sed -i 's|pref("network.protocol-handler.warn-external.ftp", false);|pref("network.protocol-handler.warn-external.ftp", true);|' mail/app/profile/all-thunderbird.js -sed -i 's|pref("network.protocol-handler.warn-external.http", false);|pref("network.protocol-handler.warn-external.http", true);|' mail/app/profile/all-thunderbird.js -sed -i 's|pref("network.protocol-handler.warn-external.https", false);|pref("network.protocol-handler.warn-external.https", true);|' mail/app/profile/all-thunderbird.js - -for p in $(find . -name "*.py"); do - sed -i 's|#!/usr/bin/python|#!%{__python}|' $p - sed -i 's|#!/usr/bin/env python|#!%{__python}|' $p - sed -i 's|#!python|#!%{__python}|' $p - sed -i 's|#!/usr/local/bin/python2.1|#!%{__python}|' $p - sed -i 's|#!/usr/local/bin/python|#!%{__python}|' $p -done +#sed -i 's|pref("network.protocol-handler.warn-external.ftp", false);|pref("network.protocol-handler.warn-external.ftp", true);|' mail/app/profile/all-thunderbird.js +#sed -i 's|pref("network.protocol-handler.warn-external.http", false);|pref("network.protocol-handler.warn-external.http", true);|' mail/app/profile/all-thunderbird.js +#sed -i 's|pref("network.protocol-handler.warn-external.https", false);|pref("network.protocol-handler.warn-external.https", true);|' mail/app/profile/all-thunderbird.js +# +#for p in $(find . -name "*.py"); do +# sed -i 's|#!/usr/bin/python|#!%{__python}|' $p +# sed -i 's|#!/usr/bin/env python|#!%{__python}|' $p +# sed -i 's|#!python|#!%{__python}|' $p +# sed -i 's|#!/usr/local/bin/python2.1|#!%{__python}|' $p +# sed -i 's|#!/usr/local/bin/python|#!%{__python}|' $p +#done #for c in $(find . -name "configure" -o -name "configure.in"); do # sed -i 's|python2.6 python2.5 python2.4 python|python2.6|' $c @@ -212,11 +199,15 @@ done rm -f .mozconfig cat << EOF > .mozconfig -mk_add_options MOZ_CO_PROJECT=mail -ac_add_options --enable-application=mail +ac_add_options --enable-application=comm/mail +ac_add_options --enable-calendar ac_add_options --prefix=%{_prefix} ac_add_options --libdir=%{_libdir} +ac_add_options --enable-linker=gold +ac_add_options --enable-release +ac_add_options --enable-rust-simd +ac_add_options --enable-optimize # System libraries ac_add_options --with-system-nspr @@ -230,28 +221,20 @@ ac_add_options --with-system-libvpx ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite ac_add_options --enable-system-ffi -ac_add_options --enable-system-cairo ac_add_options --enable-system-pixman ac_add_options --with-pthreads # Features ac_add_options --enable-official-branding -ac_add_options --enable-safe-browsing +ac_add_options --enable-update-channel=release +ac_add_options --with-distribution-id=org.openmamba ac_add_options --enable-startup-notification -ac_add_options --enable-gio -ac_add_options --disable-gstreamer -ac_add_options --disable-gnomevfs ac_add_options --disable-crashreporter ac_add_options --disable-updater ac_add_options --disable-tests -ac_add_options --disable-mochitest -ac_add_options --disable-installer ac_add_options --disable-debug-symbols -# Optimization -ac_add_options --enable-optimize - export MOZILLA_OFFICIAL=1 mk_add_options MOZILLA_OFFICIAL=1 EOF @@ -269,8 +252,7 @@ echo "export MOZ_DEBUG_SYMBOLS="1"" >> .mozconfig #__EOF %build -:<< _EOF -cd %{source_dir} +#:<< ___EOF ## Disable C++ exceptions since Mozilla code is not exception-safe #MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | \ # %{__sed} -e 's/-O2/-Os/' -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g') @@ -293,18 +275,8 @@ export MAKE="gmake %{makeflags}" export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 -#export LDFLAGS='-lX11 -lXrender' PYTHON=%{__python} -#export MOZ_PHOENIX="1" - -make -f client.mk build -# 38.5.0: not a mistake -make -f client.mk build - -#\ -# NSS_LIBS="`pkg-config --libs nss` -lcrmf" \ -# NSS_CFLAGS="`pkg-config --cflags nss`" -# SDK_BIN_DIR=%{xul_sdk_dir}/sdk/bin/ -# -f client.mk build +./mach build +./mach buildsymbols #%if %enable_debug_info #cd objdir-tb @@ -315,19 +287,21 @@ make -f client.mk build %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -cd %{source_dir} - -DESTDIR=%{buildroot} make -f client.mk install MOZ_SERVICES_SYNC="1" -# SDK_BIN_DIR=%{xul_sdk_dir}/sdk/bin/ +export DESTDIR=%{buildroot} +./mach install +#DESTDIR=%{buildroot} make -f client.mk install MOZ_SERVICES_SYNC="1" mkdir -p %{buildroot}%{_datadir}/applications desktop-file-install --mode=644 --dir %{buildroot}%{_datadir}/applications %{S:2} -for i in 16 22 24 32 48 256 ; do +for i in 16 22 24 32 48 64 128 256 ; do mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps - cp other-licenses/branding/thunderbird/mailicon${i}.png \ + cp comm/mail/branding/thunderbird/default${i}.png \ %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/thunderbird.png done +install -D -m644 comm/mail/branding/thunderbird/TB-symbolic.svg \ + %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps/thunderbird-symbolic.svg + # FIXME handle system/user preferences with xdg-open for d in %{buildroot}%{tbdir}/greprefs %{buildroot}%{tbdir}/defaults/pref ; do mkdir -p $d @@ -347,18 +321,18 @@ pref("network.protocol-handler.app.ftp", "%{_bindir}/firefox"); # disable global indexing by default pref("mailnews.database.global.indexer.enabled", false); # do not switch to Smart Folders after upgrade to 3.x -pref("mail.folder.views.version", "1") +pref("mail.folder.views.version", "1"); pref("network.protocol-handler.warn-external.ftp", true); pref("network.protocol-handler.warn-external.http", true); pref("network.protocol-handler.warn-external.https", true); _EOF done -rm -rf %{buildroot}%{_bindir}/thunderbird -rm -rf %{buildroot}%{_bindir}/thunderbird-config - -cat %{SOURCE4} | sed -e 's/MOZILLA_VERSION/%{thunderbird_internal}/g' -e 's,LIBDIR,%{_libdir},g' > %{buildroot}%{_bindir}/thunderbird -chmod 755 %{buildroot}%{_bindir}/thunderbird +#rm -rf %{buildroot}%{_bindir}/thunderbird +#rm -rf %{buildroot}%{_bindir}/thunderbird-config +# +#cat %{SOURCE4} | sed -e 's/MOZILLA_VERSION/%{thunderbird_internal}/g' -e 's,LIBDIR,%{_libdir},g' > %{buildroot}%{_bindir}/thunderbird +#chmod 755 %{buildroot}%{_bindir}/thunderbird install -d %{buildroot}%{tbdir}/extensions install -d thunderbird-langpacks && tar -C thunderbird-langpacks -xjf %{SOURCE1} @@ -387,7 +361,7 @@ touch %{buildroot}%{tbdir}/components/xpti.dat mkdir -p %{buildroot}%{_libdir}/mozilla/plugins -install -c -m 644 mozilla/LICENSE %{buildroot}%{tbdir} +#install -c -m 644 mozilla/LICENSE %{buildroot}%{tbdir} %if %{?with_calendar} mkdir -p %{buildroot}%{tbdir}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} @@ -429,12 +403,13 @@ fi %attr(755,root,root) %{_bindir}/thunderbird %{_datadir}/applications/thunderbird.desktop %{_datadir}/icons/hicolor/*x*/apps/thunderbird.png +%{_datadir}/icons/hicolor/symbolic/apps/thunderbird-symbolic.svg %dir %{_libdir}/mozilla/plugins %dir %{tbdir} -%{tbdir}/run-mozilla.sh +#%{tbdir}/run-mozilla.sh %{tbdir}/thunderbird %{tbdir}/thunderbird-bin -%{tbdir}/LICENSE +#%{tbdir}/LICENSE %{tbdir}/*.ini %{tbdir}/*.xml %{tbdir}/chrome.manifest @@ -445,20 +420,21 @@ fi %dir %{tbdir}/components %ghost %{tbdir}/components/compreg.dat %ghost %{tbdir}/components/xpti.dat -%{tbdir}/components/lib*.so -%{tbdir}/components/components.manifest +#%{tbdir}/components/lib*.so +#%{tbdir}/components/components.manifest %dir %{tbdir}/defaults %dir %{tbdir}/defaults/messenger %{tbdir}/defaults/messenger/mailViews.dat %{tbdir}/defaults/pref/*.js %{tbdir}/dependentlibs.list -#%dir %{tbdir}/distribution -#%dir %{tbdir}/distribution/extensions +%dir %{tbdir}/distribution +%dir %{tbdir}/distribution/extensions +%{tbdir}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi #%{tbdir}/distribution/extensions/tbtestpilot@labs.mozilla.com.xpi %dir %{tbdir}/dictionaries %{tbdir}/dictionaries/* %dir %{tbdir}/extensions -%{tbdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} +%{tbdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi #%if "%{?with_calendar}" #%{tbdir}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} #%{tbdir}/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc} @@ -467,28 +443,33 @@ fi #%{tbdir}/hyphenation/hyph*.dic #%dir %{tbdir}/icons #%{tbdir}/icons/updater.png +%dir %{tbdir}/fonts +%{tbdir}/fonts/EmojiOneMozilla.ttf +%{tbdir}/greprefs/all-redhat.js +%{tbdir}/gtk2/libmozgtk.so %dir %{tbdir}/isp %{tbdir}/isp/* %{tbdir}/lib*.so %{tbdir}/plugin-container #%{tbdir}/update.locale #%{tbdir}/updater -%dir %{tbdir}/greprefs -%{tbdir}/greprefs/*.js +#%dir %{tbdir}/greprefs +#%{tbdir}/greprefs/*.js %{tbdir}/omni.ja +%{tbdir}/pingsender %{tbdir}/removed-files -%dir %{tbdir}/searchplugins -%{tbdir}/searchplugins/* -%dir %{_datadir}/idl/thunderbird-%{majversion} -%{_datadir}/idl/thunderbird-%{majversion}/* +#%dir %{tbdir}/searchplugins +#%{tbdir}/searchplugins/* +#%dir %{_datadir}/idl/thunderbird-%{majversion} +#%{_datadir}/idl/thunderbird-%{majversion}/* #%{_datadir}/idl/thunderbird-%{majversion}/.mkdir.done -%files devel -%defattr(-,root,root) -%dir %{_libdir}/thunderbird-devel-%{majversion} -%{_libdir}/thunderbird-devel-%{majversion}/* -%dir %{_includedir}/thunderbird-%{version} -%{_includedir}/thunderbird-%{version}/* +#%files devel +#%defattr(-,root,root) +#%dir %{_libdir}/thunderbird-devel +#%{_libdir}/thunderbird-devel/* +#%dir %{_includedir}/thunderbird +#%{_includedir}/thunderbird/* #%{_includedir}/thunderbird-%{version}/.mkdir.done %package i18n-ast @@ -559,9 +540,9 @@ Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} %description i18n-bn-BD Bengali (Bangladesh) language support for Thunderbird. -%files i18n-bn-BD -%defattr(-,root,root) -%{tbdir}/extensions/langpack-bn-BD@thunderbird.mozilla.org/ +#%files i18n-bn-BD +#%defattr(-,root,root) +#%{tbdir}/extensions/langpack-bn-BD@thunderbird.mozilla.org/ %package i18n-br Summary: Breton language support for Thunderbird @@ -930,6 +911,30 @@ Japanese language support for Thunderbird. #%defattr(-,root,root) #%{tbdir}/extensions/langpack-ka@thunderbird.mozilla.org/ +%package i18n-kab +Summary: Kabyle language support for Thunderbird +Group: System/Internationalization +Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} + +%description i18n-kab +Kabyle language support for Thunderbird. + +%files i18n-kab +%defattr(-,root,root) +%{tbdir}/extensions/langpack-kab@thunderbird.mozilla.org/ + +%package i18n-kk +Summary: Kazakh language support for Thunderbird +Group: System/Internationalization +Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} + +%description i18n-kk +Kazakh language support for Thunderbird. + +%files i18n-kk +%defattr(-,root,root) +%{tbdir}/extensions/langpack-kk@thunderbird.mozilla.org/ + %package i18n-ko Summary: Korean language support for Thunderbird Group: System/Internationalization @@ -954,6 +959,18 @@ Lithuanian language support for Thunderbird. %defattr(-,root,root) %{tbdir}/extensions/langpack-lt@thunderbird.mozilla.org/ +%package i18n-ms +Summary: Montserrat language support for Thunderbird +Group: System/Internationalization +Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} + +%description i18n-ms +Montserrat language support for Thunderbird. + +%files i18n-ms +%defattr(-,root,root) +%{tbdir}/extensions/langpack-ms@thunderbird.mozilla.org/ + #%package i18n-mk #Summary: Macedonian language support for Thunderbird #Group: System/Internationalization @@ -1017,9 +1034,9 @@ Provides: %{name}-i18n-pa = %{?epoch:%epoch:}%{version}-%{release} %description i18n-pa-IN Punjabi (IN) language support for Thunderbird. -%files i18n-pa-IN -%defattr(-,root,root) -%{tbdir}/extensions/langpack-pa-IN@thunderbird.mozilla.org/ +#%files i18n-pa-IN +#%defattr(-,root,root) +#%{tbdir}/extensions/langpack-pa-IN@thunderbird.mozilla.org/ %package i18n-pl Summary: Polish language support for Thunderbird @@ -1178,9 +1195,9 @@ Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} %description i18n-ta-LK Tamil (Sri Lanka) language support for Thunderbird. -%files i18n-ta-LK -%defattr(-,root,root) -%{tbdir}/extensions/langpack-ta-LK@thunderbird.mozilla.org/ +#%files i18n-ta-LK +#%defattr(-,root,root) +#%{tbdir}/extensions/langpack-ta-LK@thunderbird.mozilla.org/ %package i18n-tr Summary: Turkish language support for Thunderbird @@ -1243,6 +1260,12 @@ Chinese (Traditional) language support for Thunderbird. %{tbdir}/extensions/langpack-zh-TW@thunderbird.mozilla.org/ %changelog +* Tue Jan 22 2019 Silvan Calarco 60.4.0-1mamba +- update to 60.4.0 + +* Fri May 20 2016 Silvan Calarco 45.1.0-1mamba +- update to 45.1.0 + * Sat Feb 13 2016 Automatic Build System 38.6.0-1mamba - automatic version update by autodist