Merge branch 'master' into f15

This commit is contained in:
Jan Horak 2011-04-28 16:46:04 +02:00
commit d71f7d23de
3 changed files with 10 additions and 5 deletions

2
.gitignore vendored
View File

@ -14,3 +14,5 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2
/thunderbird-langpacks-3.1.8-20110301.tar.bz2 /thunderbird-langpacks-3.1.8-20110301.tar.bz2
/thunderbird-3.1.9.source.tar.bz2 /thunderbird-3.1.9.source.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-langpacks-3.1.10-20110428.tar.xz

View File

@ -1,2 +1,2 @@
e6917c419d3aaa8083a1d4b53fb80d8c thunderbird-3.1.9.source.tar.bz2 2a81f3ee7ea7acff0ee2eaee6574ea11 thunderbird-3.1.10.source.tar.bz2
15693685f50c13810bcf7710e98be394 thunderbird-langpacks-3.1.9-20110307.tar.bz2 c21b3e81e832809fc9de80122886a51c thunderbird-langpacks-3.1.10-20110428.tar.xz

View File

@ -28,8 +28,8 @@
Summary: Mozilla Thunderbird mail/newsgroup client Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird Name: thunderbird
Version: 3.1.9 Version: 3.1.10
Release: 7%{?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+
Group: Applications/Internet Group: Applications/Internet
@ -40,7 +40,7 @@ Group: Applications/Internet
%endif %endif
Source0: %{tarball} Source0: %{tarball}
%if %{build_langpacks} %if %{build_langpacks}
Source1: thunderbird-langpacks-%{version}-20110307.tar.bz2 Source1: thunderbird-langpacks-%{version}-20110428.tar.xz
%endif %endif
Source10: thunderbird-mozconfig Source10: thunderbird-mozconfig
Source11: thunderbird-mozconfig-branded Source11: thunderbird-mozconfig-branded
@ -382,6 +382,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#=============================================================================== #===============================================================================
%changelog %changelog
* Thu Apr 28 2011 Jan Horak <jhorak@redhat.com> - 3.1.10-1
- Update to 3.1.10
* Thu Apr 21 2011 Christopher Aillon <caillon@redhat.com> - 3.1.9-7 * Thu Apr 21 2011 Christopher Aillon <caillon@redhat.com> - 3.1.9-7
- Make gvfs-open launch a compose window (salimma) - Make gvfs-open launch a compose window (salimma)
- Spec file cleanups (salimma, caillon) - Spec file cleanups (salimma, caillon)