new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6761 ec354946-7b23-47d6-9f5a-488ba84defc7

t/thunderbird/thunderbird-vl.spec

@@ -1,5 +1,5 @@
 # do not include minor version number in MOZILLA_FIVE_HOME
-%define tbmajor 14.0
+%define tbmajor 15.0
 #%define tbversion %{tbmajor}.10
 %define tbversion %{tbmajor}
 %define tbrelease 1%{?_dist_release}
@@ -27,7 +27,6 @@
 
 %define build_vine7 0
 %define build_vine6 0
-%define build_vine5 0
 
 %if "%{?_dist_release}" >= "vl7"
 %define build_vine7 1
@@ -35,10 +34,6 @@
 %if "%{?_dist_release}" == "vl6"
 %define build_vine6 1
 %endif
-%if "%{?_dist_release}" == "vl5"
-%define build_vine5 1
-%endif
-
 
 Summary:	Thunderbird Community Edition, Mail/newsgroup client
 Summary(ja):	Thunderbirdコミュニティエディション, メール・ニュースクライアント
@@ -51,9 +46,8 @@ Group:		Applications/Internet
 
 Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/%{tbversion}/source/thunderbird-%{version}.source.tar.bz2
 Source1:	ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/%{tbversion}/linux-x86_64/xpi/ja.xpi
-Source1010:	mozconfig-thunderbird-vine5
-Source1020:	mozconfig-thunderbird-vine6
-Source1030:	mozconfig-thunderbird-vine7
+Source1010:	mozconfig-thunderbird-vine6
+Source1020:	mozconfig-thunderbird-vine7
 Source12:	thunderbird-vine-default-prefs.js
 Source20:	thunderbird.desktop
 Source21:	thunderbird.vine.sh.in
@@ -94,14 +88,11 @@ BuildRequires:	hunspell-devel
 %endif
 %if %{build_vine6}
 BuildRequires:	hunspell-devel
+BuildRequires:	python-devel
 %endif
 BuildRequires:	pixman-devel
 BuildRequires:	libpng-devel
-%if %{build_vine5}
-BuildRequires:	libjpeg-devel
-%else
 BuildRequires:	libjpeg-turbo-devel
-%endif
 BuildRequires:	gtk2-devel
 BuildRequires:	zlib-devel, gzip, zip, unzip
 BuildRequires:	libIDL-devel
@@ -161,14 +152,11 @@ cd mozilla
 
 cd -
 %{__rm} -f .mozconfig
-%if %{build_vine5}
-%{__cp} %{SOURCE1010} .mozconfig
-%endif
 %if %{build_vine6}
-%{__cp} %{SOURCE1020} .mozconfig
+%{__cp} %{SOURCE1010} .mozconfig
 %endif
 %if %{build_vine7}
-%{__cp} %{SOURCE1030} .mozconfig
+%{__cp} %{SOURCE1020} .mozconfig
 %endif
 
 # setup unofficial branding name
@@ -356,6 +344,11 @@ fi
 #===============================================================================
 
 %changelog
+* Wed Aug 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 15.0-1
+- new upstream release
+- add BuildRequires: python-devel (Vine6 only)
+- remove build rule of Vine5
+
 * Wed Jul 18 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 14.0-1
 - new upstream release
 - remove Patch2	(thunderbird-13.0-buildfix-nspr.patch)