Merge branch 'master' into f15

This commit is contained in:
Jan Horak 2011-09-30 16:17:52 +02:00
commit d9b05b6155
3 changed files with 9 additions and 4 deletions

2
.gitignore vendored
View File

@ -26,3 +26,5 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2
/thunderbird-langpacks-6.0.2-20110906.tar.xz
/thunderbird-7.0.source.tar.bz2
/thunderbird-langpacks-7.0-20110927.tar.xz
/thunderbird-7.0.1.source.tar.bz2
/thunderbird-langpacks-7.0.1-20110930.tar.xz

View File

@ -1,2 +1,2 @@
6a4b2dbdc2324f52c019a3a8dee6dad4 thunderbird-7.0.source.tar.bz2
a7005466350abeebea533b2589e58955 thunderbird-langpacks-7.0-20110927.tar.xz
ad177fe5202deabda44882ff5c871f1b thunderbird-7.0.1.source.tar.bz2
95ff11c17e3a3edd8a6ba7712a8f7348 thunderbird-langpacks-7.0.1-20110930.tar.xz

View File

@ -33,7 +33,7 @@
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
Version: 7.0
Version: 7.0.1
Release: 1%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -45,7 +45,7 @@ Group: Applications/Internet
%endif
Source0: %{tarball}
%if %{build_langpacks}
Source1: thunderbird-langpacks-%{version}-20110927.tar.xz
Source1: thunderbird-langpacks-%{version}-20110930.tar.xz
%endif
Source10: thunderbird-mozconfig
Source11: thunderbird-mozconfig-branded
@ -342,6 +342,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#===============================================================================
%changelog
* Fri Sep 30 2011 Jan Horak <jhorak@redhat.com> - 7.0.1-1
- Update to 7.0.1
* Tue Sep 27 2011 Jan Horak <jhorak@redhat.com> - 7.0-1
- Update to 7.0