rpms/thunderbird
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into f15

Browse Source 
Conflicts:
	thunderbird-mozconfig
	thunderbird.spec
This commit is contained in:
Christopher Aillon 2011-03-18 10:01:34 -07:00
commit 530850fef4
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
thunderbird-mozconfig
View File

@ -30,6 +30,8 @@ ac_add_options --disable-crashreporter
ac_add_options --disable-necko-wifi
ac_add_options --disable-updater
ac_add_options --enable-static
ac_add_options --enable-gio
ac_add_options --disable-gnomevfs
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1

11
thunderbird.spec
View File

@ -31,7 +31,7 @@
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
Version: %{thunderbird_version}
Release: 1%{?dist}
Release: 3%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@ -84,9 +84,6 @@ BuildRequires: bzip2-devel
BuildRequires: zlib-devel
BuildRequires: libIDL-devel
BuildRequires: gtk2-devel
BuildRequires: gnome-vfs2-devel
BuildRequires: libgnome-devel
BuildRequires: libgnomeui-devel
BuildRequires: krb5-devel
BuildRequires: pango-devel
BuildRequires: freetype-devel >= %{freetype_version}
@ -391,6 +388,12 @@ fi
#===============================================================================
%changelog
* Fri Mar 18 2011 Jan Horak <jhorak@redhat.com> - 3.1.9-3
- Removed gnome-vfs2, libgnomeui and libgnome from build requires
* Wed Mar 9 2011 Jan Horak <jhorak@redhat.com> - 3.1.9-2
- Disabled gnomevfs, enabled gio
* Mon Mar 7 2011 Jan Horak <jhorak@redhat.com> - 3.1.9-1
- Update to 3.1.9