update to 5.0

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

t/thunderbird/thunderbird-vl.spec

@@ -1,6 +1,7 @@
 # do not include minor version number in MOZILLA_FIVE_HOME
-%define tbmajor 3.1
-%define tbversion %{tbmajor}.10
+%define tbmajor 5.0
+#%define tbversion %{tbmajor}.10
+%define tbversion %{tbmajor}
 %define tbrelease 1%{?_dist_release}
 
 # The tarball is pretty inconsistent with directory structure.
@@ -9,11 +10,11 @@
 # IMPORTANT: If there is no top level directory, this should be 
 # set to the cwd, ie: '.'
 #%define tarballdir .
-%define tarballdir comm-1.9.2
+%define tarballdir comm-miramar
 
 %define mozappdir %{_libdir}/%{name}-%{version_internal}
 %define moz_objdir objdir-tb
-%define version_internal 3.1
+%define version_internal 5.0
 %define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} 
 
 %define desktop_file_utils_version 0.6
@@ -45,62 +46,34 @@ License:	MPL
 Group:		Applications/Internet
 
 Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/%{tbversion}/source/thunderbird-%{version}.source.tar.bz2
-#Source1010:	mozconfig-thunderbird-vine3
-#Source1020:	mozconfig-thunderbird-vine4
-Source1030:	mozconfig-thunderbird-vine5
-Source1040:	mozconfig-thunderbird-vine6
+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
 Source12:	thunderbird-vine-default-prefs.js
 Source20:	thunderbird.desktop
 Source21:	thunderbird.vine.sh.in
-#Source22:	thunderbird.png
 Source30:	thunderbird-open-browser.sh
 Source40:	thunderbird-unofficial-brandig-tb-brand.properties
 Source41:	thunderbird-unofficial-brandig-tb-brand.dtd
+Source42:	thunderbird-unofficial-brandig-tb-ja-brand.properties
+Source43:	thunderbird-unofficial-brandig-tb-ja-brand.dtd
 Source100:	find-external-requires
 
 # locale sources
-%define MOZ_BUILD_LOCALES "ja"
+#%define MOZ_BUILD_LOCALES "ja"
 # get from mercurial repository with command, 
 # mkdir l10n
 # hg clone http://hg.mozilla.org/releases/l10n-mozilla-1.9.2/ja l10n/ja
-Source1000:     thunderbird-%{tbversion}-ja.tar.bz2
+#Source1000:     thunderbird-%{tbversion}-ja.tar.bz2
 
 
 # upstream patch
 
 # Fix for version issues
 Patch0:         thunderbird-version.patch
-# Fix for jemalloc
-Patch1:         mozilla-jemalloc.patch
-# Fix for installation fail when building with dynamic linked libraries
-Patch2:         thunderbird-shared-error.patch
-# Fixes gcc complain that nsFrame::delete is protected
-Patch4:         xulrunner-1.9.2.1-build.patch
-# Fix for building with libjpeg-turbo
-Patch5:        mozilla-libjpeg-turbo.patch
 
 # customization patches
-#Patch22:        firefox-1.0-psfonts.patch
-#Patch24:        thunderbird-2.0-default-applications.patch
-#Patch25:        thunderbird-1.1-software-update.patch
-Patch26:        firefox-1.5-default-a4-paper.patch
-
-# font system fixes
-#Patch81:        firefox-nopangoxft.patch
-
-## Vine patch
-# http://bugzilla.mozilla.org/show_bug.cgi?id=179248
-Patch1000:	thunderbird-3.1-sjisalias.patch
-
-# use /proc/net/netstat for random seed instead of netstat command.
-#Patch1010:      firefox-nss-no_netstat.patch
-
-# workaround gcc visibility hidden bugs (see gcc#26905)
-Patch1020:	firefox-2.0.0.3-visibility.patch
-
-# temporary fix for compilation error with PR_STATIC_ASSERT
-# refer http://bugs.gentoo.org/show_bug.cgi?id=336413
-Patch1030:	thunderbird-3.1.3-fix-prlog-include-error.patch
+Patch1:        firefox-1.5-default-a4-paper.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	pango-devel
@@ -111,14 +84,18 @@ BuildRequires:	nss-devel >= %{nss_version}
 %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
 BuildRequires:	freetype2-devel >= %{freetype_version}
 ## disabled libnotify support
 ## see related bug: https://bugzilla.mozilla.org/show_bug.cgi?id=478463
-#BuildRequires:  libnotify-devel >= %{libnotify_version}
+BuildRequires:  libnotify-devel >= %{libnotify_version}
 BuildRequires:	bzip2-devel
 BuildRequires:	gnome-vfs2-devel
 BuildRequires:  libgnome-devel
@@ -133,6 +110,7 @@ BuildRequires:	sqlite3-devel >= %{sqlite_version}
 BuildRequires:	startup-notification-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	alsa-lib-devel
+BuildRequires:	yasm
 Requires:	sqlite3 >= %{sqlite_version}
 Requires(post):		desktop-file-utils >= %{desktop_file_utils_version}
 Requires(postun):	desktop-file-utils >= %{desktop_file_utils_version}
@@ -155,7 +133,7 @@ Thunderbird はスタンドアローンのメールおよびニュースクラ
 #===============================================================================
 
 %prep
-%setup -q %{name}-%{version} -c -b 1000
+%setup -q %{name}-%{version} -c
 cd %{tarballdir}
 
 # Fix for version issue
@@ -163,32 +141,16 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
     > version.patch
 %{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
 
-%patch1 -p0 -b .jemalloc
-%patch2 -p1 -b .shared-error
-%patch4 -p1 -b .protected
-
 cd mozilla
-
-%patch5 -p1 -b .libjpeg-turbo
-#%patch22 -p1
-#%patch24 -p1
-#%patch25 -p0
-%patch26 -p1 -b .default-a4
-%patch1000 -p1 -b .sjis-alias
-%patch1030 -p3 -b .prlog-fix
+%patch1 -p1 -b .default-a4
 
 cd -
 %{__rm} -f .mozconfig
 %if %{build_vine5}
-%{__cp} %{SOURCE1030} .mozconfig
+%{__cp} %{SOURCE1010} .mozconfig
 %endif
 %if %{build_vineseed}
-%{__cp} %{SOURCE1040} .mozconfig
-# cannot build with xulrunner (yet)
-# see tracking bugs.
-#   https://bugzilla.mozilla.org/show_bug.cgi?id=306324
-#   https://bugzilla.mozilla.org/show_bug.cgi?id=377319 
-#echo "ac_add_options --with-libxul-sdk=`pkg-config --variable=sdkdir libxul`" >> .mozconfig
+%{__cp} %{SOURCE1020} .mozconfig
 %endif
 
 # setup unofficial branding name
@@ -224,15 +186,15 @@ export LDFLAGS="-Wl,-rpath,%{mozappdir}"
 export MAKE="gmake %{moz_make_flags}"
 %{__make} -f client.mk build
 
-# build locales
-LOCALEDIRS=`find . -print | grep 'locales/Makefile$' | \
-            sed -e 's|\./\(.*\)/locales/.*|\1|g'`
-for dir in $LOCALEDIRS
-do
-  for lang in %{MOZ_BUILD_LOCALES} ; do
-    make -C $dir/locales AB_CD=$lang
-  done
-done
+## build locales
+#LOCALEDIRS=`find . -print | grep 'locales/Makefile$' | \
+#            sed -e 's|\./\(.*\)/locales/.*|\1|g'`
+#for dir in $LOCALEDIRS
+#do
+#  for lang in %{MOZ_BUILD_LOCALES} ; do
+#    make -C $dir/locales AB_CD=$lang
+#  done
+#done
 
 #===============================================================================
 
@@ -250,6 +212,8 @@ DESTDIR=$RPM_BUILD_ROOT make install
 
 # install unofficial icons
 cd -
+
+%{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/icons
 %{__cp} mail/branding/unofficial/mailicon16.png \
         $RPM_BUILD_ROOT/%{mozappdir}/icons/
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
@@ -272,10 +236,7 @@ cd -
         $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps/thunderbird.png
 
 desktop-file-install --vendor vine \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category Application \
-  --add-category Network \
-  %{SOURCE20}
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE20}
 
 # set up the thunderbird start script
 rm -f $RPM_BUILD_ROOT/%{_bindir}/thunderbird
@@ -303,9 +264,16 @@ install -Dm755 %{SOURCE30} $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
 %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{thunderbird_app_id}
 
 # install locales
-for lang in %{MOZ_BUILD_LOCALES} ; do
-  %{__install} -p -D -m 664 %{moz_objdir}/mozilla/dist/bin/chrome/$lang.{jar,manifest} $RPM_BUILD_ROOT%{mozappdir}/chrome/
-done
+#for lang in %{MOZ_BUILD_LOCALES} ; do
+#  %{__install} -p -D -m 664 %{moz_objdir}/objdir-tb/mozilla/dist/bin/chrome/$lang.{jar,manifest} $RPM_BUILD_ROOT%{mozappdir}/chrome/
+#done
+
+# install ja.xpi to langpacks directory
+%{__mkdir_p} $RPM_BUILD_ROOT/%{mozappdir}/langpacks/langpack-ja@thunderbird.mozilla.org
+unzip %{SOURCE1} -d $RPM_BUILD_ROOT/%{mozappdir}/langpacks/langpack-ja@thunderbird.mozilla.org
+# also setup unofficial branding name
+%{__cp} %{SOURCE42} $RPM_BUILD_ROOT/%{mozappdir}/langpacks/langpack-ja@thunderbird.mozilla.org/chrome/ja/locale/ja/branding/brand.properties
+%{__cp} %{SOURCE43} $RPM_BUILD_ROOT/%{mozappdir}/langpacks/langpack-ja@thunderbird.mozilla.org/chrome/ja/locale/ja/branding/brand.dtd
 
 
 %clean
@@ -339,10 +307,28 @@ fi
 %{_datadir}/icons/hicolor/32x32/apps/thunderbird.png
 %{_datadir}/icons/hicolor/48x48/apps/thunderbird.png
 %{mozappdir}
+#%{_libdir}/mozilla
+%exclude %{_libdir}/%{name}-%{version_internal}/removed-files
+%exclude %{_datadir}/idl/%{name}-%{version_internal}
+%exclude %{_includedir}/%{name}-%{version_internal}
+%exclude %{_libdir}/%{name}-devel-%{version_internal}
 
 #===============================================================================
 
 %changelog
+* Wed Jul 06 2011 Kazutaka HARADA <kazutaka@vinelinux.org> 5.0-1
+- new upstream release
+- drop obsolete patch and renumber patch26 to patch1 
+- add BuildRequires: yasm
+- enable libnotify support
+- add --disable-updater and --disable-installer to mozconfig
+- use ja.xpi instead of l10n source
+- update Source21: add step to setup langpack plugin
+- update Source20: add japanese translation
+- add Source42 & Source43 for localized branding
+- add --disable-system-cairo and ac_add_options --disable-libjpeg-turbo
+  for mozconfig-thunderbird-vine5
+
 * Mon May 16 2011 Kazutaka HARADA <kazutaka@vinelinux.org> 3.1.10-1
 - new upstream release with security fix