diff --git a/.cvsignore b/.cvsignore index 80fc8ff..c3f4f44 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -thunderbird-3.0.4.source.tar.bz2 -thunderbird-langpacks-3.0.4-20100330.tar.bz2 +thunderbird-3.1rc1.source.tar.bz2 +thunderbird-langpacks-3.1-20100527.tar.bz2 diff --git a/sources b/sources index e43d233..a537926 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -bb87ca7e62d5869422137765126798be thunderbird-3.0.4.source.tar.bz2 -5b51715204ff7f0c33dac25e0ba27b16 thunderbird-langpacks-3.0.4-20100330.tar.bz2 +b47a9a014f10a383741bf2806990a796 thunderbird-3.1rc1.source.tar.bz2 +31ee40e57d44bc0ce5674d0b57c3e7d1 thunderbird-langpacks-3.1-20100527.tar.bz2 diff --git a/thunderbird-shared-error.patch b/thunderbird-shared-error.patch index ae41bbc..2869fd8 100644 --- a/thunderbird-shared-error.patch +++ b/thunderbird-shared-error.patch @@ -11,5 +11,6 @@ diff -up comm-central/mail/installer/Makefile.in.shared-error comm-central/mail/ endif +endif - # On mozilla-central, packager.mk uses core_abspath to redefine DIST - # As the comm-central config.mk doesn't set it, do it ourselves instead + include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk + + diff --git a/thunderbird-version.patch b/thunderbird-version.patch index 07979cb..fa3096f 100644 --- a/thunderbird-version.patch +++ b/thunderbird-version.patch @@ -1,11 +1,12 @@ ---- comm-1.9.1/mail/installer/Makefile.in.old 2010-01-20 14:27:43.000000000 +0100 -+++ comm-1.9.1/mail/installer/Makefile.in 2010-01-20 14:29:21.000000000 +0100 -@@ -42,6 +42,8 @@ VPATH = @srcdir@ +diff -up comm-1.9.2/mail/installer/Makefile.in.version comm-1.9.2/mail/installer/Makefile.in +--- comm-1.9.2/mail/installer/Makefile.in.version 2010-05-21 11:42:45.000000000 -0700 ++++ comm-1.9.2/mail/installer/Makefile.in 2010-05-25 15:16:18.446197181 -0700 +@@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk - include $(DEPTH)/config/autoconf.mk + include $(topsrcdir)/config/rules.mk +MOZ_APP_VERSION="__RPM_VERSION_INTERNAL__" + - NO_PKG_FILES = \ - thunderbird-bin.elf \ - thunderbird-config \ + MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in + + MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in diff --git a/thunderbird.spec b/thunderbird.spec index bf1ac0d..511b5c3 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -13,30 +13,31 @@ # IMPORTANT: If there is no top level directory, this should be # set to the cwd, ie: '.' #%define tarballdir . -%define tarballdir comm-1.9.1 +%define tarballdir comm-1.9.2 %define official_branding 1 %define include_debuginfo 0 -%define version_internal 3.0 +%define version_internal 3.1 %define mozappdir %{_libdir}/%{name}-%{version_internal} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 3.0.4 -Release: 3%{?dist} +Version: 3.1 +Release: 0.1.rc1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet %if %{official_branding} -%define tarball thunderbird-%{version}.source.tar.bz2 +#%define tarball thunderbird-%{version}.source.tar.bz2 +%define tarball thunderbird-3.1rc1.source.tar.bz2 %else -%define tarball thunderbird-3.0b2-source.tar.bz2 +%define tarball thunderbird-3.1rc1.source.tar.bz2 %endif Source0: %{tarball} %if %{build_langpacks} # Language package archive is build by RH -Source1: thunderbird-langpacks-%{version}-20100330.tar.bz2 +Source1: thunderbird-langpacks-%{version}-20100527.tar.bz2 %endif # Config file for compilation Source10: thunderbird-mozconfig @@ -61,8 +62,7 @@ Patch0: thunderbird-version.patch Patch1: mozilla-jemalloc.patch # Fix for installation fail when building with dynamic linked libraries Patch2: thunderbird-shared-error.patch -# Fix for crash mozbz#550455, remove when 3.0.5 -Patch3: thunderbird-436533.patch + %if %{official_branding} # Required by Mozilla Corporation @@ -109,38 +109,6 @@ AutoProv: 0 %description Mozilla Thunderbird is a standalone mail and newsgroup client. -#%package devel -#Summary: Development files for Thunderbird -#Group: Development/Libraries -#Provides: thunderbird-devel = %{version} -# -#Requires: thunderbird = %{version}-%{release} -#Requires: nspr-devel >= %{nspr_version} -#Requires: nss-devel >= %{nss_version} -#Requires: cairo-devel >= %{cairo_version} -#Requires: libjpeg-devel -#Requires: bzip2-devel -#Requires: zlib-devel -#Requires: libIDL-devel -#Requires: gtk2-devel -#Requires: gnome-vfs2-devel -#Requires: libgnome-devel -#Requires: libgnomeui-devel -#Requires: krb5-devel -#Requires: pango-devel -#Requires: freetype-devel >= %{freetype_version} -#Requires: libXt-devel -#Requires: libXrender-devel -#Requires: hunspell-devel -#Requires: sqlite-devel -#Requires: startup-notification-devel -#Requires: alsa-lib-devel -#Requires: libnotify-devel - -#%description devel -#Thunderbird development files. -# -#=============================================================================== %prep %setup -q -c @@ -152,7 +120,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \ %patch1 -p0 -b .jemalloc %patch2 -p1 -b .shared-error -%patch3 -p1 -b .436533 %if %{official_branding} # Required by Mozilla Corporation @@ -323,15 +290,6 @@ ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{mozappdir}/dictionaries touch $RPM_BUILD_ROOT%{mozappdir}/components/compreg.dat touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat -# Devel package - sdk -#%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/idl/thunderbird-%{version_internal} -#%{__cp} %{moz_objdir}/mozilla/dist/sdk/idl/* $RPM_BUILD_ROOT%{_datadir}/idl/thunderbird-%{version_internal} - -#%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/include/thunderbird-%{version_internal} -#%{__cp} %{moz_objdir}/mozilla/dist/sdk/include/* $RPM_BUILD_ROOT%{_datadir}/include/thunderbird-%{version_internal} - -#%{__cp} %{moz_objdir}/mozilla/dist/sdk/bin/* $RPM_BUILD_ROOT%{mozappdir}/ - # Add debuginfo for crash-stats.mozilla.com %if %{include_debuginfo} @@ -422,18 +380,13 @@ fi %{mozappdir}/Throbber-small.gif %endif -# TODO: devel package -#%files devel -#%defattr(-,root,root,-) -#%{_datadir}/idl/thunderbird-%{version_internal} -#%{_datadir}/include/thunderbird-%{version_internal} -#%{mozappdir}/xpidl -#%{mozappdir}/xpt_dump -#%{mozappdir}/xpt_link #=============================================================================== %changelog +* Tue May 25 2010 Christopher Aillon 3.1-0.1.rc1 +- Thunderbird 3.1 RC1 + * Fri Apr 30 2010 Jan Horak - 3.0.4-3 - Fix for mozbz#550455