Merge branch 'master' into f15

This commit is contained in:
Jan Horak 2011-06-21 17:24:49 +02:00
commit f6773332bc
3 changed files with 12 additions and 4 deletions

2
.gitignore vendored
View File

@ -16,3 +16,5 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2
/thunderbird-langpacks-3.1.9-20110307.tar.bz2 /thunderbird-langpacks-3.1.9-20110307.tar.bz2
/thunderbird-3.1.10.source.tar.bz2 /thunderbird-3.1.10.source.tar.bz2
/thunderbird-langpacks-3.1.10-20110428.tar.xz /thunderbird-langpacks-3.1.10-20110428.tar.xz
/thunderbird-3.1.11.source.tar.bz2
/thunderbird-langpacks-3.1.11-20110621.tar.xz

View File

@ -1,2 +1,2 @@
2a81f3ee7ea7acff0ee2eaee6574ea11 thunderbird-3.1.10.source.tar.bz2 25833b3f90925d96285630d22c85cd5c thunderbird-3.1.11.source.tar.bz2
c21b3e81e832809fc9de80122886a51c thunderbird-langpacks-3.1.10-20110428.tar.xz 665e67c68b0816338751baab34dbb6b4 thunderbird-langpacks-3.1.11-20110621.tar.xz

View File

@ -28,7 +28,7 @@
Summary: Mozilla Thunderbird mail/newsgroup client Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird Name: thunderbird
Version: 3.1.10 Version: 3.1.11
Release: 1%{?dist} Release: 1%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/ URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -40,7 +40,7 @@ Group: Applications/Internet
%endif %endif
Source0: %{tarball} Source0: %{tarball}
%if %{build_langpacks} %if %{build_langpacks}
Source1: thunderbird-langpacks-%{version}-20110428.tar.xz Source1: thunderbird-langpacks-%{version}-20110621.tar.xz
%endif %endif
Source10: thunderbird-mozconfig Source10: thunderbird-mozconfig
Source11: thunderbird-mozconfig-branded Source11: thunderbird-mozconfig-branded
@ -380,6 +380,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#=============================================================================== #===============================================================================
%changelog %changelog
* Tue Jun 21 2011 Jan Horak <jhorak@redhat.com> - 3.1.11-1
- Update to 3.1.11
* Wed May 25 2011 Caolán McNamara <caolanm@redhat.com> - 3.1.10-2
- rebuild for new hunspell
* Thu Apr 28 2011 Jan Horak <jhorak@redhat.com> - 3.1.10-1 * Thu Apr 28 2011 Jan Horak <jhorak@redhat.com> - 3.1.10-1
- Update to 3.1.10 - Update to 3.1.10