new upstream release

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

p/pidgin/pidgin-vl.spec

@@ -16,7 +16,7 @@
 Summary:	A GTK+ based multi-protocol instant messaging client
 Summary(ja):	マルチプロトコル対応のインスタントメッセンジャー
 Name:		pidgin
-Version:	2.10.0
+Version:	2.10.1
 Release:	1%{?_dist_release}
 License:	GPL
 Group:		Applications/Internet
@@ -343,6 +343,10 @@ fi
 %{_libdir}/pkgconfig/gnt.pc
 
 %changelog
+* Fri Dec 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.10.1-1
+- new upstream release
+- update patch0
+
 * Sun Sep 04 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.10.0-1
 - new upstream release
 - update patch0 for pidgin-2.10.0

t/thunderbird/mozconfig-thunderbird-vine6

@@ -14,7 +14,7 @@ ac_add_options --with-system-zlib
 # (2010/06/13 K.Harada)
 #ac_add_options --with-system-png
 ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
+#ac_add_options --with-system-nss
 ac_add_options --enable-system-cairo
 ac_add_options --with-pthreads
 ac_add_options --disable-tests

t/thunderbird/mozconfig-thunderbird-vine7

@@ -0,0 +1,54 @@
+mk_add_options MOZ_CO_PROJECT=mail
+ac_add_options --enable-application=mail
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir-tb/
+mk_add_options AUTOCONF=autoconf-2.13
+mk_add_options BUILD_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
+
+ac_add_options --prefix="$PREFIX"
+ac_add_options --libdir="$LIBDIR"
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+# thunderbird requires libpng with apng support,
+# so we can not use system-provided png library.
+# (2010/06/13 K.Harada)
+#ac_add_options --with-system-png
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --enable-system-cairo
+ac_add_options --with-pthreads
+ac_add_options --disable-tests
+ac_add_options --disable-debug
+ac_add_options --enable-jsd
+ac_add_options --disable-installer
+ac_add_options --enable-optimize="$RPM_OPT_FLAGS"
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --enable-pango
+ac_add_options --enable-xinerama
+ac_add_options --enable-crypto
+ac_add_options --enable-svg
+ac_add_options --enable-canvas
+ac_add_options --disable-xprint
+ac_add_options --disable-strip
+ac_add_options --disable-official-branding
+#ac_add_options --disable-install-strip
+ac_add_options --enable-install-strip
+# hunspell is in plus category for vine (2010/07/23 K.Harada)
+ac_add_options --disable-system-hunspell
+ac_add_options --disable-crashreporter
+ac_add_options --disable-necko-wifi
+ac_add_options --disable-updater
+ac_add_options --disable-installer
+
+# cat not build with xulrunner (yet)  (2010/06/13 K.Harada)
+#ac_add_options --enable-libxul
+#ac_add_options --with-system-libxul
+#ac_add_options --disable-ldap
+ac_add_options --with-branding=mail/branding/aurora
+ac_add_options --with-distribution-id=org.vinelinux
+
+#ac_add_options --with-l10n-base=../../l10n
+
+# disabled libnotify support  (2010/07/03 K.Harada)
+# see related bug: https://bugzilla.mozilla.org/show_bug.cgi?id=478463
+# ac_add_options --disable-libnotify

t/thunderbird/thunderbird-vl.spec

@@ -1,8 +1,8 @@
 # do not include minor version number in MOZILLA_FIVE_HOME
-%define tbmajor 8.0
+%define tbmajor 9.0
 #%define tbversion %{tbmajor}.10
 %define tbversion %{tbmajor}
-%define tbrelease 2%{?_dist_release}
+%define tbrelease 1%{?_dist_release}
 
 # The tarball is pretty inconsistent with directory structure.
 # Sometimes there is a top level directory.  That goes here.
@@ -14,21 +14,25 @@
 
 %define mozappdir %{_libdir}/%{name}-%{version_internal}
 %define moz_objdir objdir-tb
-%define version_internal 8.0
+%define version_internal 9.0
 %define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} 
 
 %define desktop_file_utils_version 0.6
 %define nspr_version 4.8
-%define nss_version 3.12.6
+%define nss_version 3.13.1
 %define cairo_version 1.6.0
 %define freetype_version 2.1.9
 %define sqlite_version 3.6.14
 %define libnotify_version 0.4
 
+%define build_vine7 0
 %define build_vine6 0
 %define build_vine5 0
 
-%if "%{?_dist_release}" >= "vl6"
+%if "%{?_dist_release}" >= "vl7"
+%define build_vine7 1
+%endif
+%if "%{?_dist_release}" == "vl6"
 %define build_vine6 1
 %endif
 %if "%{?_dist_release}" == "vl5"
@@ -49,6 +53,7 @@ Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/%{tbversion}
 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
 Source12:	thunderbird-vine-default-prefs.js
 Source20:	thunderbird.desktop
 Source21:	thunderbird.vine.sh.in
@@ -73,16 +78,23 @@ Source100:	find-external-requires
 Patch0:         thunderbird-version.patch
 
 # customization patches
-Patch1:        firefox-1.5-default-a4-paper.patch
+Patch1:		firefox-1.5-default-a4-paper.patch
+
+# Linux specific
+Patch100:	thunderbird-9.0-enable-addons.patch
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:	pango-devel
 BuildRequires:	cairo-devel >= %{cairo_version}
-%if %{build_vine6}
+%if %{build_vine7}
 BuildRequires:	nspr-devel >= %{nspr_version}
 BuildRequires:	nss-devel >= %{nss_version}
 BuildRequires:	hunspell-devel
 %endif
+%if %{build_vine6}
+BuildRequires:	nspr-devel >= %{nspr_version}
+BuildRequires:	hunspell-devel
+%endif
 BuildRequires:	pixman-devel
 BuildRequires:	libpng-devel
 %if %{build_vine5}
@@ -155,11 +167,16 @@ cd -
 %if %{build_vine6}
 %{__cp} %{SOURCE1020} .mozconfig
 %endif
+%if %{build_vine7}
+%{__cp} %{SOURCE1030} .mozconfig
+%endif
 
 # setup unofficial branding name
 %{__cp} %{SOURCE40} mail/branding/aurora/locales/en-US/brand.properties
 %{__cp} %{SOURCE41} mail/branding/aurora/locales/en-US/brand.dtd
 
+%patch100 -p1 -b .addons
+
 #===============================================================================
 
 %build
@@ -330,6 +347,11 @@ fi
 #===============================================================================
 
 %changelog
+* Fri Dec 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 9.0-1
+- new upstream release
+- add Source1030 (mozconfig-thunderbird-vine7)
+- add Patch100 (thunderbird-9.0-enable-addons.patch)
+
 * Thu Nov 10 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 8.0-2
 - fix %%version_internal