From b89543e8f40dab2cc493367098d732567a997219 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Thu, 1 May 2008 22:09:48 +0000 Subject: [PATCH] - Update to 2.0.0.14 - Use the system dictionaries --- .cvsignore | 4 ++-- sources | 4 ++-- thunderbird.spec | 28 +++++++++++++++++++--------- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/.cvsignore b/.cvsignore index cb2ded0..651a8e3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -thunderbird-langpacks-2.0.0.12-20080226.tar.bz2 -thunderbird-2.0.0.12-source.tar.bz2 +thunderbird-langpacks-2.0.0.14-20080501.tar.bz2 +thunderbird-2.0.0.14-source.tar.bz2 diff --git a/sources b/sources index 8e71214..36e2dda 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -4aebeaad511dd0ba73fbabfdd6819438 thunderbird-langpacks-2.0.0.12-20080226.tar.bz2 -c23f576a8fd0ceee5135829c8ae5168b thunderbird-2.0.0.12-source.tar.bz2 +d8cf331743cc00eef920c8d65d7cde09 thunderbird-langpacks-2.0.0.14-20080501.tar.bz2 +e304510d08f7e226bbfff8e7e549232f thunderbird-2.0.0.14-source.tar.bz2 diff --git a/thunderbird.spec b/thunderbird.spec index cd6689e..f5ba395 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -7,8 +7,8 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 2.0.0.12 -Release: 4%{?dist} +Version: 2.0.0.14 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -18,7 +18,7 @@ Group: Applications/Internet %define tarball thunderbird-2.0.0.0rc1-source.tar.bz2 %endif Source0: %{tarball} -Source1: thunderbird-langpacks-%{version}-20080226.tar.bz2 +Source1: thunderbird-langpacks-%{version}-20080501.tar.bz2 Source10: thunderbird-mozconfig Source11: thunderbird-mozconfig-branded Source12: thunderbird-redhat-default-prefs.js @@ -31,8 +31,6 @@ Source100: find-external-requires # Build patches Patch1: firefox-2.0-link-layout.patch Patch2: firefox-1.0-prdtoa.patch -Patch3: thunderbird-2.0.0.12-gcc43.patch -Patch4: thunderbird-2.0.0.12-SECAlgorithmID.patch Patch10: thunderbird-0.7.3-psfonts.patch Patch11: thunderbird-0.7.3-gnome-uriloader.patch @@ -106,8 +104,6 @@ cd mozilla %patch1 -p1 -b .link-layout %patch2 -p0 -%patch3 -p0 -b .gcc43 -%patch4 -p1 -b .SECAlgorithmID %patch10 -p1 -b .psfonts %patch11 -p1 -b .gnome-uriloader @@ -188,7 +184,7 @@ DESTDIR=$RPM_BUILD_ROOT make install %{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications,%{_datadir}/icons/hicolor/48x48/apps} -%{__install} -p -D %{SOURCE22} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{__install} -p -D %{SOURCE22} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png desktop-file-install --vendor mozilla \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -262,6 +258,10 @@ done # Copy over the LICENSE install -c -m 644 LICENSE $RPM_BUILD_ROOT%{mozappdir} +# Use the system hunspell dictionaries +%{__rm} -rf $RPM_BUILD_ROOT/%{mozappdir}/dictionaries +ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{mozappdir}/dictionaries + # ghost files touch $RPM_BUILD_ROOT%{mozappdir}/components/compreg.dat touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat @@ -288,7 +288,7 @@ fi %defattr(-,root,root,-) %attr(755,root,root) %{_bindir}/thunderbird %attr(644,root,root) %{_datadir}/applications/mozilla-thunderbird.desktop -%attr(644,root,root) %{_datadir}/icons/hicolor/48x48/apps/thunderbird.png +%attr(644,root,root) %{_datadir}/pixmaps/thunderbird.png %dir %{mozappdir} %doc %{mozappdir}/LICENSE %{mozappdir}/chrome @@ -329,6 +329,16 @@ fi #=============================================================================== %changelog +* Thu May 1 2008 Christopher Aillon - 2.0.0.14-1 +- Update to 2.0.0.14 +- Use the system dictionaries + +* Fri Apr 18 2008 Christopher Aillon - 2.0.0.12-6 +- Icon belongs in _datadir/pixmaps + +* Fri Apr 18 2008 Christopher Aillon - 2.0.0.12-5 +- rebuilt + * Mon Apr 7 2008 Christopher Aillon 2.0.0.12-4 - Add %%lang attributes to langpacks