Wed May 13 20:41:08 UTC 2009

Author: caillon

Update of /cvs/extras/rpms/thunderbird/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24678

Modified Files:
      Tag: private-THUNDERBIRD_3_FC10_BRANCH
	.cvsignore sources thunderbird-mozconfig 
	thunderbird-redhat-default-prefs.js thunderbird.spec 
Added Files:
      Tag: private-THUNDERBIRD_3_FC10_BRANCH
	mozilla-jemalloc.patch thunderbird-shared-error.patch 
Removed Files:
      Tag: private-THUNDERBIRD_3_FC10_BRANCH
	firefox-1.0-prdtoa.patch firefox-1.1-uriloader.patch 
	firefox-1.5-bullet-bill.patch 
	firefox-1.5-pango-cursor-position-more.patch 
	firefox-1.5-pango-cursor-position.patch 
	firefox-1.5-pango-justified-range.patch 
	firefox-1.5-pango-underline.patch 
	firefox-1.5-theme-change.patch 
	firefox-1.5-xft-rangewidth.patch firefox-2.0-link-layout.patch 
	firefox-2.0-pango-ligatures.patch 
	firefox-2.0-pango-printing.patch 
	firefox-2.0.0.4-undo-uriloader.patch 
	thunderbird-0.7.3-gnome-uriloader.patch 
	thunderbird-0.7.3-psfonts.patch 
	thunderbird-1.5-profile-migrator.patch 
	thunderbird-2.0-default-applications.patch 
	thunderbird-2.0-enable-debug.patch 
	thunderbird-2.0.0.12-SECAlgorithmID.patch 
	thunderbird-2.0.0.12-gcc43.patch thunderbird-path.patch 
Log Message:
* Wed May 13 2009 Christopher Aillon <caillon at redhat.com> - 3.0-0.5
- Merge in the Thunderbird 3 devel tree
- 3.0pre3 nightly for test day


mozilla-jemalloc.patch:

--- NEW FILE mozilla-jemalloc.patch ---
diff -r f1af606531f5 memory/jemalloc/jemalloc.h
--- mozilla/memory/jemalloc/jemalloc.h	Sat Nov 22 20:22:22 2008 +0100
+++ mozilla/memory/jemalloc/jemalloc.h	Mon Dec 01 16:53:06 2008 -0500
@@ -45,14 +45,14 @@
 } jemalloc_stats_t;
 
 #ifndef MOZ_MEMORY_DARWIN
-void	*malloc(size_t size);
-void	*valloc(size_t size);
-void	*calloc(size_t num, size_t size);
-void	*realloc(void *ptr, size_t size);
-void	free(void *ptr);
+void	*malloc(size_t size)  __THROW __attribute_malloc__ __wur;
+void	*valloc(size_t size)  __THROW __attribute_malloc__ __wur;
+void	*calloc(size_t num, size_t size)  __THROW __attribute_malloc__ __wur;
+void	*realloc(void *ptr, size_t size)  __THROW __attribute_malloc__ __wur;
+void	free(void *ptr)  __THROW __attribute_malloc__ __wur;
 #endif
 
-int	posix_memalign(void **memptr, size_t alignment, size_t size);
+int	posix_memalign(void **memptr, size_t alignment, size_t size)  __THROW __attribute_malloc__ __wur;
 void	*memalign(size_t alignment, size_t size);
 size_t	malloc_usable_size(const void *ptr);
 void	jemalloc_stats(jemalloc_stats_t *stats);

thunderbird-shared-error.patch:

--- NEW FILE thunderbird-shared-error.patch ---
diff -upU8 thunderbird-3.0/mail/installer/Makefile.in.shared-error thunderbird-3.0/mail/installer/Makefile.in
--- thunderbird-3.0/mail/installer/Makefile.in.shared-error	2009-02-24 03:16:03.000000000 +0100
+++ thunderbird-3.0/mail/installer/Makefile.in	2009-02-27 16:02:31.000000000 +0100
@@ -56,16 +56,17 @@ NO_PKG_FILES = \
 	PalmSyncInstall.exe \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
 
 ifdef BUILD_STATIC_LIBS
+ifeq (BUILD_STATIC_LIBS, 1)
 ifeq (WINNT,$(OS_ARCH))
 MOZ_PKG_MANIFEST_P = $(srcdir)/windows/packages-static
 endif
 else
 $(error you need a "--enable-static --disable-shared" build to create an installer)
 endif
 
 MOZ_NONLOCALIZED_PKG_LIST = \
@@ -80,16 +81,17 @@ MOZ_LOCALIZED_PKG_LIST = $(AB_CD)
 DEFINES += -DAB_CD=$(AB_CD)
 
 ifdef MOZ_PKG_MANIFEST_P
 MOZ_PKG_MANIFEST = packages-static
 
 $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P)
 	$(PERL) $(MOZILLA_SRCDIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $< > $@
 endif
+endif
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 MOZ_PKG_MAC_DSSTORE=branding/dsstore
 MOZ_PKG_MAC_BACKGROUND=branding/background.png
 MOZ_PKG_MAC_ICON=branding/disk.icns
 MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
 endif
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/F-10/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -p -r1.24 -r1.24.2.1
--- .cvsignore	20 Mar 2009 15:36:17 -0000	1.24
+++ .cvsignore	13 May 2009 20:40:37 -0000	1.24.2.1
@@ -1,2 +1 @@
-thunderbird-2.0.0.21-source.tar.bz2
-thunderbird-langpacks-2.0.0.21-20090320.tar.bz2
+thunderbird-3.0-6a6386c16e98-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/F-10/sources,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -u -p -r1.31 -r1.31.2.1
--- sources	20 Mar 2009 15:36:17 -0000	1.31
+++ sources	13 May 2009 20:40:37 -0000	1.31.2.1
@@ -1,2 +1 @@
-55e24753a7ccf2fbf0272987dd4bb086  thunderbird-2.0.0.21-source.tar.bz2
-d693cb3a9592397fcacca20e4e72bb35  thunderbird-langpacks-2.0.0.21-20090320.tar.bz2
+ec5efa909535d4a764d8a0c0fa5d4a38  thunderbird-3.0-6a6386c16e98-source.tar.bz2


Index: thunderbird-mozconfig
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/F-10/thunderbird-mozconfig,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -p -r1.7 -r1.7.2.1
--- thunderbird-mozconfig	12 Apr 2007 20:32:40 -0000	1.7
+++ thunderbird-mozconfig	13 May 2009 20:40:37 -0000	1.7.2.1
@@ -1,4 +1,9 @@
-. $topsrcdir/mail/config/mozconfig
+mk_add_options MOZ_CO_PROJECT=mail
+ac_add_options --enable-application=mail
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir-tb/
+mk_add_options AUTOCONF=autoconf-2.13
+
+#ac_add_options --with-system-png
 
 ac_add_options --prefix="$PREFIX"
 ac_add_options --libdir="$LIBDIR"
@@ -6,20 +11,21 @@ ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
-ac_add_options --with-system-png
 ac_add_options --with-pthreads
 ac_add_options --disable-tests
 ac_add_options --disable-debug
 ac_add_options --disable-installer
 ac_add_options --enable-optimize="$RPM_OPT_FLAGS"
 ac_add_options --enable-xinerama
-ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --disable-xprint
 ac_add_options --disable-strip
+ac_add_options --disable-install-strip
 ac_add_options --enable-pango
 ac_add_options --enable-system-cairo
 ac_add_options --enable-svg
 ac_add_options --enable-canvas
+ac_add_options --disable-crashreporter
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1


Index: thunderbird-redhat-default-prefs.js
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/F-10/thunderbird-redhat-default-prefs.js,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -p -r1.3 -r1.3.2.1
--- thunderbird-redhat-default-prefs.js	8 Oct 2006 23:02:33 -0000	1.3
+++ thunderbird-redhat-default-prefs.js	13 May 2009 20:40:38 -0000	1.3.2.1
@@ -4,6 +4,7 @@ pref("browser.display.use_system_colors"
 pref("general.useragent.vendor", "Fedora");
 pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
 pref("intl.locale.matchOS", true);
+pref("mail.shell.checkDefaultClient", false);
 
 # Make hyperlinks work
 pref("network.protocol-handler.app.http", "COMMAND");


Index: thunderbird.spec
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/F-10/thunderbird.spec,v
retrieving revision 1.124
retrieving revision 1.124.2.1
diff -u -p -r1.124 -r1.124.2.1
--- thunderbird.spec	30 Mar 2009 14:11:54 -0000	1.124
+++ thunderbird.spec	13 May 2009 20:40:38 -0000	1.124.2.1
@@ -2,23 +2,28 @@
 %define nspr_version 4.6
 %define nss_version 3.10
 %define cairo_version 1.0
+%define dbus_glib_version 0.6
+%define version_internal 3.0b3pre
+%define build_langpacks 0
 
 %define official_branding 1
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        2.0.0.21
-Release:        2%{?dist}
+Version:        3.0
+Release:        0.5.b3pre.hg.6a6386c16e98%{?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}-6a6386c16e98-source.tar.bz2
 %else
-%define tarball thunderbird-2.0.0.0rc1-source.tar.bz2
+%define tarball thunderbird-3.0b2-source.tar.bz2
 %endif
 Source0:        %{tarball}
-Source1:        thunderbird-langpacks-%{version}-20090320.tar.bz2
+%if %{build_langpacks}
+Source1:        thunderbird-langpacks-%{version}-20090302.tar.bz2
+%endif
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
 Source12:       thunderbird-redhat-default-prefs.js
@@ -28,35 +33,8 @@ Source22:       thunderbird.png
 Source30:       thunderbird-open-browser.sh
 Source100:      find-external-requires
 
-# Build patches
-Patch1:         firefox-2.0-link-layout.patch
-Patch2:         firefox-1.0-prdtoa.patch
-
-Patch10:        thunderbird-0.7.3-psfonts.patch
-Patch11:        thunderbird-0.7.3-gnome-uriloader.patch
-
-# customization patches
-Patch24:        thunderbird-2.0-default-applications.patch
-
-# local bugfixes
-Patch40:        firefox-1.5-bullet-bill.patch
-Patch41:        firefox-2.0.0.4-undo-uriloader.patch
-Patch42:        firefox-1.1-uriloader.patch
-
-# font system fixes
-Patch83:        firefox-1.5-pango-cursor-position.patch
-Patch84:        firefox-2.0-pango-printing.patch
-Patch85:        firefox-1.5-pango-cursor-position-more.patch
-Patch86:        firefox-1.5-pango-justified-range.patch
-Patch87:        firefox-1.5-pango-underline.patch
-Patch88:        firefox-1.5-xft-rangewidth.patch
-Patch89:        firefox-2.0-pango-ligatures.patch
-
-# Other 
-Patch102:       firefox-1.5-theme-change.patch
-Patch103:       thunderbird-1.5-profile-migrator.patch
-Patch111:       thunderbird-path.patch
-Patch112:       thunderbird-2.0-enable-debug.patch
+Patch1:         mozilla-jemalloc.patch
+Patch2:         thunderbird-shared-error.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -72,22 +50,27 @@ Patch112:       thunderbird-2.0-enable-d
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       nspr >= %{nspr_version}
 Requires:       nss >= %{nss_version}
-%if 0%{?rhel} >= 5
-Requires:       launchmail
-%endif
+BuildRequires:  libcurl-devel
 BuildRequires:  cairo-devel >= %{cairo_version}
+BuildRequires:  dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires:  libpng-devel, libjpeg-devel, gtk2-devel
 BuildRequires:  zlib-devel, gzip, zip, unzip
 BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  nss-devel >= %{nss_version}
 BuildRequires:  libIDL-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  freetype-devel
+BuildRequires:  pango-devel >= 1.22
+BuildRequires:  freetype-devel >= 2.1.9
 BuildRequires:  libXt-devel
 BuildRequires:  libXrender-devel
+BuildRequires:  alsa-lib-devel
+BuildRequires:  autoconf213
+BuildRequires:  GConf2-devel
+BuildRequires:  gnome-vfs2-devel
+BuildRequires:  libgnomeui-devel
 Requires:       desktop-file-utils >= %{desktop_file_utils_version}
 
-%define mozappdir %{_libdir}/thunderbird-%{version}
+%define mozappdir %{_libdir}/thunderbird-%{version_internal}
 
 AutoProv: 0
 %define _use_internal_dependency_generator 0
@@ -100,39 +83,10 @@ Mozilla Thunderbird is a standalone mail
 
 %prep
 %setup -q -c
-cd mozilla
+#cd mozilla
 
-%patch1 -p1 -b .link-layout
-%patch2 -p0
-
-%patch10 -p1 -b .psfonts
-%patch11 -p1 -b .gnome-uriloader
-%patch24 -p1 -b .default-applications
-%patch40 -p1
-%patch41 -p1
-%patch42 -p0
-
-# font system fixes
-%patch83 -p1 -b .pango-cursor-position
-%patch84 -p0 -b .pango-printing
-%patch85 -p1 -b .pango-cursor-position-more
-%patch86 -p1 -b .pango-justified-range
-%patch87 -p1 -b .pango-underline
-%patch88 -p1 -b .nopangoxft2
-%patch89 -p1 -b .pango-ligatures
-pushd gfx/src/ps
-  # This sort of sucks, but it works for now.
-  ln -s ../gtk/nsFontMetricsPango.h .
-  ln -s ../gtk/nsFontMetricsPango.cpp .
-  ln -s ../gtk/mozilla-decoder.h .
-  ln -s ../gtk/mozilla-decoder.cpp .
-popd
-
-
-%patch102 -p0 -b .theme-change
-%patch103 -p1 -b .profile-migrator
-%patch111 -p1 -b .path
-%patch112 -p1 -b .debug
+%patch1 -p0 -b .jemalloc
+%patch2 -p1 -b .shared-error
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -154,7 +108,7 @@ popd
 #===============================================================================
 
 %build
-cd mozilla
+#cd mozilla
 
 # Build with -Os as it helps the browser; also, don't override mozilla's warning
 # level; they use -Wall but disable a few warnings that show up _everywhere_
@@ -164,11 +118,12 @@ export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
 export PREFIX='%{_prefix}'
 export LIBDIR='%{_libdir}'
 
-%ifarch ppc ppc64 s390 s390x
 %define moz_make_flags -j1
-%else
-%define moz_make_flags %{?_smp_mflags}
-%endif
+#%ifarch ppc ppc64 s390 s390x
+#%define moz_make_flags -j1
+#%else
+#%define moz_make_flags %{?_smp_mflags}
+#%endif
 
 export LDFLAGS="-Wl,-rpath,%{mozappdir}"
 export MAKE="gmake %{moz_make_flags}"
@@ -178,10 +133,12 @@ make -f client.mk build
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-cd mozilla
+#cd mozilla
 
+cd objdir-tb
 DESTDIR=$RPM_BUILD_ROOT make install
 
+cd -
 %{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications,%{_datadir}/icons/hicolor/48x48/apps}
 
 %{__install} -p -D %{SOURCE22} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
@@ -192,20 +149,22 @@ desktop-file-install --vendor mozilla \
   --add-category Email \
   %{SOURCE20}
 
+
 # set up the thunderbird start script
-%{__cat} %{SOURCE21} | %{__sed} -e 's,TBIRD_VERSION,%{version},g' > \
+rm -f $RPM_BUILD_ROOT/%{_bindir}/thunderbird
+%{__cat} %{SOURCE21} | %{__sed} -e 's,TBIRD_VERSION,%{version_internal},g' > \
   $RPM_BUILD_ROOT%{_bindir}/thunderbird
 %{__chmod} 755 $RPM_BUILD_ROOT/%{_bindir}/thunderbird
 
-install -m755 %{SOURCE30} $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
+install -Dm755 %{SOURCE30} $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
 %{__sed} -i -e 's|LIBDIR|%{_libdir}|g' $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
 
 # set up our default preferences
 %{__cat} %{SOURCE12} | %{__sed} -e 's,THUNDERBIRD_RPM_VR,%{version}-%{release},g' \
                                 -e 's,COMMAND,%{mozappdir}/open-browser.sh,g' > \
         $RPM_BUILD_ROOT/rh-default-prefs
-%{__cp} $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/greprefs/all-redhat.js
-%{__cp} $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/all-redhat.js
+%{__install} -D $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/greprefs/all-redhat.js
+%{__install} -D $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/all-redhat.js
 %{__rm} $RPM_BUILD_ROOT/rh-default-prefs
 
 %{__rm} -f $RPM_BUILD_ROOT%{_bindir}/thunderbird-config
@@ -217,6 +176,8 @@ cd -
 %{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/chrome/icons/default/
 %{__cp} other-licenses/branding/%{name}/default.xpm \
         $RPM_BUILD_ROOT%{mozappdir}/chrome/icons/default/
+
+%{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/icons/
 %{__cp} other-licenses/branding/%{name}/default.xpm \
         $RPM_BUILD_ROOT%{mozappdir}/icons/
 
@@ -224,7 +185,10 @@ cd -
 %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins
 
 # Install langpacks
-touch ../%{name}.lang
+%{__rm} -f %{name}.lang # Delete for --short-circuit option
+touch %{name}.lang
+
+%if %{build_langpacks}
 %{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/extensions
 %{__tar} xjf %{SOURCE1}
 for langpack in `ls thunderbird-langpacks/*.xpi`; do
@@ -250,19 +214,22 @@ for langpack in `ls thunderbird-langpack
 
   language=`echo $language | sed -e 's/-/_/g'`
   extensiondir=`echo $extensiondir | sed -e "s,^$RPM_BUILD_ROOT,,"`
-  echo "%%lang($language) $extensiondir" >> ../%{name}.lang
+  echo "%%lang($language) $extensiondir" >> %{name}.lang
 done
 %{__rm} -rf thunderbird-langpacks
-
+%endif # build_langpacks
 
 # Copy over the LICENSE
+cd mozilla
 install -c -m 644 LICENSE $RPM_BUILD_ROOT%{mozappdir}
+cd -
 
 # Use the system hunspell dictionaries
 %{__rm} -rf $RPM_BUILD_ROOT/%{mozappdir}/dictionaries
 ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{mozappdir}/dictionaries
 
 # 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
 
@@ -304,42 +271,56 @@ fi
 %{mozappdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
 %{mozappdir}/greprefs
 %{mozappdir}/icons
-%{mozappdir}/init.d
 %{mozappdir}/isp
 %{mozappdir}/mozilla-xremote-client
 %{mozappdir}/open-browser.sh
-%{mozappdir}/regxpcom
 %{mozappdir}/res
 %{mozappdir}/run-mozilla.sh
 %{mozappdir}/thunderbird-bin
 %{mozappdir}/thunderbird
 %{mozappdir}/updater
 %{mozappdir}/*.so
-
-%exclude %{_includedir}/%{name}-%{version}
-%exclude %{_datadir}/idl/%{name}-%{version}
-%exclude %{_libdir}/pkgconfig/*.pc
-%exclude %{mozappdir}/TestGtkEmbed
-%exclude %{mozappdir}/xpidl
-%exclude %{mozappdir}/xpcshell
-%exclude %{mozappdir}/xpt_dump
-%exclude %{mozappdir}/xpt_link
-%exclude %{mozappdir}/xpicleanup
+%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}/updater.ini
+%{mozappdir}/application.ini
+%exclude %{mozappdir}/LICENSE.txt
+%exclude %{mozappdir}/license.html
+%exclude %{mozappdir}/dependentlibs.list
+%exclude %{mozappdir}/removed-files
 
 #===============================================================================
 
 %changelog
-* Mon Mar 30 2009 Jan Horak <jhorak at redhat.com> - 2.0.0.21-2
+* Wed May 13 2009 Christopher Aillon <caillon at redhat.com> - 3.0-0.5
+- 3.0pre3 nightly for test day
+
+* Mon Mar 30 2009 Jan Horak <jhorak at redhat.com> - 3.0-0.4
 - Fixed open-browser.sh to use xdg-open instead of gnome-open
 
-* Fri Mar 20 2009 Christopher Aillon <caillon at redhat.com> - 2.0.0.21-1
-- Update to 2.0.0.21
+* Mon Mar 23 2009 Christopher Aillon <caillon at redhat.com> - 3.0-0.3
+- Disable the default app nag dialog
 
-* Wed Jan 07 2009 Christopher Aillon <caillon at redhat.com> - 2.0.0.19-2
-- Disable the crash dialog
+* Tue Mar 17 2009 Jan Horak <jhorak at redhat.com> - 3.0-0.2
+- Fixed clicked link does not open in browser (#489120)
+- Fixed missing help in thunderbird (#488885)
+
+* Mon Mar  2 2009 Jan Horak <jhorak at redhat.com> - 3.0-0.1
+- Update to 3.0 beta2
+- Added Patch2 to build correctly when building with --enable-shared option 
 
-* Mon Jan  5 2009 Christopher Aillon <caillon at redhat.com> 2.0.0.19-1
-- Update to 2.0.0.19
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0.18-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Jan 07 2009 Christopher Aillon <caillon at redhat.com> - 2.0.0.18-2
+- Disable the crash dialog
 
 * Wed Nov 19 2008 Christopher Aillon <caillon at redhat.com> 2.0.0.18-1
 - Update to 2.0.0.18


--- firefox-1.0-prdtoa.patch DELETED ---


--- firefox-1.1-uriloader.patch DELETED ---


--- firefox-1.5-bullet-bill.patch DELETED ---


--- firefox-1.5-pango-cursor-position-more.patch DELETED ---


--- firefox-1.5-pango-cursor-position.patch DELETED ---


--- firefox-1.5-pango-justified-range.patch DELETED ---


--- firefox-1.5-pango-underline.patch DELETED ---


--- firefox-1.5-theme-change.patch DELETED ---


--- firefox-1.5-xft-rangewidth.patch DELETED ---


--- firefox-2.0-link-layout.patch DELETED ---


--- firefox-2.0-pango-ligatures.patch DELETED ---


--- firefox-2.0-pango-printing.patch DELETED ---


--- firefox-2.0.0.4-undo-uriloader.patch DELETED ---


--- thunderbird-0.7.3-gnome-uriloader.patch DELETED ---


--- thunderbird-0.7.3-psfonts.patch DELETED ---


--- thunderbird-1.5-profile-migrator.patch DELETED ---


--- thunderbird-2.0-default-applications.patch DELETED ---


--- thunderbird-2.0-enable-debug.patch DELETED ---


--- thunderbird-2.0.0.12-SECAlgorithmID.patch DELETED ---


--- thunderbird-2.0.0.12-gcc43.patch DELETED ---


--- thunderbird-path.patch DELETED ---


