From 939b6d748353db69f9760f8f4d6a4a0e64621f66 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 17 Jul 2011 11:47:57 +0200 Subject: thunderbird 5.0, sync with rawhide --- thunderbird.spec | 79 ++++++++++++++++++-------------------------------------- 1 file changed, 25 insertions(+), 54 deletions(-) (limited to 'thunderbird.spec') diff --git a/thunderbird.spec b/thunderbird.spec index e1994a2..2550df1 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -14,22 +14,18 @@ # IMPORTANT: If there is no top level directory, this should be # set to the cwd, ie: '.' #%define tarballdir . -%define tarballdir comm-1.9.2 +%define tarballdir comm-miramar %define official_branding 1 -# enable crash reporter only for iX86 -%ifarch %{ix86} x86_64 -%define enable_mozilla_crashreporter 1 -%else +# don't enable crash reporter for remi repo %define enable_mozilla_crashreporter 0 -%endif -%define version_internal 3.1 +%define version_internal 5.0 %define mozappdir %{_libdir}/%{name}-%{version_internal} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 3.1.11 +Version: 5.0 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -41,7 +37,7 @@ Group: Applications/Internet %endif Source0: %{tarball} %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}-20110625.tar.bz2 +Source1: thunderbird-langpacks-%{version}-20110717.tar.bz2 %endif Source10: thunderbird-mozconfig @@ -54,14 +50,8 @@ Source100: find-external-requires # Mozilla (XULRunner) patches Patch0: thunderbird-version.patch -Patch1: thunderbird-default.patch -Patch2: mozilla-jemalloc.patch -Patch3: xulrunner-1.9.2.1-build.patch -Patch4: mozilla-libjpeg-turbo.patch -Patch5: mozilla-missing-cflags.patch Patch6: mozilla-build-s390.patch Patch7: crashreporter-remove-static.patch -Patch9: xulrunner-2.0-os2cc.patch %if %{official_branding} # Required by Mozilla Corporation @@ -109,6 +99,8 @@ BuildRequires: alsa-lib-devel BuildRequires: autoconf213 BuildRequires: desktop-file-utils BuildRequires: libcurl-devel +BuildRequires: yasm +BuildRequires: mesa-libGL-devel BuildRequires: GConf2-devel Requires: mozilla-filesystem @@ -174,18 +166,10 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ # Mozilla (XULRunner) patches cd mozilla -%patch1 -p2 -b .default-application -%patch2 -p1 -b .jemalloc -%patch3 -p2 -b .protected -%if %{fedora} >= 14 -%patch4 -p2 -b .turbo -%endif -%patch5 -p2 -b .mozcflags %ifarch s390 %patch6 -p1 -b .s390 %endif %patch7 -p2 -b .static -%patch9 -p1 -b .os2cc cd .. %if %{official_branding} @@ -298,8 +282,6 @@ done desktop-file-install --vendor mozilla \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category Network \ - --add-category Email \ ../%{name}.desktop @@ -336,23 +318,9 @@ for langpack in `ls thunderbird-langpacks/*.xpi`; do language=`basename $langpack .xpi` extensiondir=$RPM_BUILD_ROOT%{mozappdir}/langpacks/langpack-$language@thunderbird.mozilla.org %{__mkdir_p} $extensiondir - unzip $langpack -d $extensiondir + unzip -q $langpack -d $extensiondir find $extensiondir -type f | xargs chmod 644 - - tmpdir=`mktemp -d %{name}.XXXXXXXX` - langtmp=$tmpdir/%{name}/langpack-$language - %{__mkdir_p} $langtmp - jarfile=$extensiondir/chrome/$language.jar - unzip $jarfile -d $langtmp - - find $langtmp -type f | xargs chmod 644 - %{__rm} -rf $jarfile - cd $langtmp - zip -r -D $jarfile locale - %{__rm} -rf locale - cd - - %{__rm} -rf $tmpdir - + language=`echo $language | sed -e 's/-/_/g'` extensiondir=`echo $extensiondir | sed -e "s,^$RPM_BUILD_ROOT,,"` echo "%%lang($language) $extensiondir" >> %{name}.lang @@ -444,10 +412,11 @@ fi %dir %{mozappdir}/components %ghost %{mozappdir}/components/compreg.dat %ghost %{mozappdir}/components/xpti.dat -%{mozappdir}/components/components.list -%{mozappdir}/components/*.so -%{mozappdir}/components/*.xpt -%attr(644,root,root) %{mozappdir}/components/*.js +%{mozappdir}/components/binary.manifest +%{mozappdir}/components/libdbusservice.so +%{mozappdir}/components/libmozgnome.so +%{mozappdir}/omni.jar +%{mozappdir}/plugin-container %{mozappdir}/defaults %{mozappdir}/dictionaries %dir %{mozappdir}/extensions @@ -456,18 +425,10 @@ fi %{mozappdir}/greprefs %{mozappdir}/isp %{mozappdir}/mozilla-xremote-client -%{mozappdir}/res %{mozappdir}/run-mozilla.sh %{mozappdir}/thunderbird-bin %{mozappdir}/thunderbird %{mozappdir}/*.so -%dir %{mozappdir}/modules -%{mozappdir}/modules/*.jsm -%{mozappdir}/modules/*.js -%dir %{mozappdir}/modules/gloda -%{mozappdir}/modules/gloda/*.js -%dir %{mozappdir}/modules/activity -%{mozappdir}/modules/activity/*.js %{mozappdir}/README.txt %{mozappdir}/platform.ini %{mozappdir}/application.ini @@ -484,12 +445,22 @@ fi %{mozappdir}/crashreporter.ini %{mozappdir}/Throbber-small.gif %endif +%exclude %{_datadir}/idl/%{name}-%{version_internal} +%exclude %{_includedir}/%{name}-%{version_internal} +%exclude %{_libdir}/%{name}-devel-%{version_internal} +%{mozappdir}/chrome.manifest #=============================================================================== %changelog +* Sun Jul 17 2011 Remi Collet 5.0-1 +- Thunderbird 5.0, sync with rawhide + +* Tue Jun 28 2011 Jan Horak - 5.0-1 +- Update to 5.0 + * Sat Jun 25 2011 Remi Collet 3.1.11-1 -- Thunderbird 3.1.10 +- Thunderbird 3.1.11 * Tue Jun 21 2011 Jan Horak - 3.1.11-1 - Update to 3.1.11 -- cgit