|
|
@@ -1,5 +1,5 @@
|
|
|
# do not include minor version number in MOZILLA_FIVE_HOME
|
|
|
-%define tbmajor 17.0.8
|
|
|
+%define tbmajor 24.0
|
|
|
#%define tbversion %{tbmajor}.10
|
|
|
%define tbversion %{tbmajor}
|
|
|
%define tbrelease 1%{?_dist_release}
|
|
|
@@ -10,7 +10,7 @@
|
|
|
# IMPORTANT: If there is no top level directory, this should be
|
|
|
# set to the cwd, ie: '.'
|
|
|
#%define tarballdir .
|
|
|
-%define tarballdir comm-esr17
|
|
|
+%define tarballdir comm-esr24
|
|
|
|
|
|
%define mozappdir %{_libdir}/%{name}-%{version_internal}
|
|
|
%define moz_objdir objdir-tb
|
|
|
@@ -78,18 +78,22 @@ Patch1: firefox-1.5-default-a4-paper.patch
|
|
|
# Linux specific
|
|
|
Patch100: thunderbird-9.0-enable-addons.patch
|
|
|
|
|
|
+# Vine Patch
|
|
|
+Patch2000: thunderbird-24.0-vine6.patch
|
|
|
+
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
BuildRequires: pango-devel
|
|
|
BuildRequires: cairo-devel >= %{cairo_version}
|
|
|
%if %{build_vine7}
|
|
|
-BuildRequires: nspr-devel >= %{nspr_version}
|
|
|
-BuildRequires: nss-devel >= %{nss_version}
|
|
|
-BuildRequires: hunspell-devel
|
|
|
+#BuildRequires: nspr-devel >= %{nspr_version}
|
|
|
+#BuildRequires: nss-devel >= %{nss_version}
|
|
|
+BuildRequires: python-devel
|
|
|
%endif
|
|
|
%if %{build_vine6}
|
|
|
-BuildRequires: hunspell-devel
|
|
|
-BuildRequires: python-devel
|
|
|
+BuildRequires: python27-devel
|
|
|
%endif
|
|
|
+BuildRequires: gstreamer-devel
|
|
|
+BuildRequires: gstreamer-plugins-base-devel
|
|
|
BuildRequires: pixman-devel
|
|
|
BuildRequires: libpng-devel
|
|
|
BuildRequires: libjpeg-turbo-devel
|
|
|
@@ -130,7 +134,7 @@ Provides: MozillaThunderbird = %{version}
|
|
|
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
-Packager: daisuke, ryoichi, kazutaka
|
|
|
+Packager: daisuke, ryoichi, kazutaka, Takemikaduchi
|
|
|
|
|
|
AutoProv: 0
|
|
|
%define _use_internal_dependency_generator 0
|
|
|
@@ -170,11 +174,15 @@ cd -
|
|
|
%{__cp} %{SOURCE41} mail/branding/aurora/locales/en-US/brand.dtd
|
|
|
|
|
|
%patch100 -p1 -b .addons
|
|
|
+%if %{build_vine6}
|
|
|
+%patch2000 -p1 -b .vine
|
|
|
+%endif
|
|
|
|
|
|
#===============================================================================
|
|
|
|
|
|
%build
|
|
|
cd %{tarballdir}
|
|
|
+autoconf-2.13
|
|
|
|
|
|
INTERNAL_GECKO=%{version_internal}
|
|
|
MOZ_APP_DIR=%{mozappdir}
|
|
|
@@ -190,8 +198,9 @@ MOZ_APP_DIR=%{mozappdir}
|
|
|
#MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %__sed -e 's/-Wall//')
|
|
|
#%endif
|
|
|
#%endif
|
|
|
-MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \
|
|
|
- %{__sed} -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')
|
|
|
+
|
|
|
+MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | \
|
|
|
+ %{__sed} -e 's/-Wall//')
|
|
|
export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
|
|
|
export CFLAGS="$RPM_OPT_FLAGS"
|
|
|
#export CFLAGS=""
|
|
|
@@ -212,6 +221,7 @@ MOZ_SMP_FLAGS=-j1
|
|
|
[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8
|
|
|
%endif
|
|
|
|
|
|
+export LDFLAGS="-Wl,-rpath,%{ffdir}"
|
|
|
%__make -f client.mk build STRIP="/bin/true" \
|
|
|
MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
|
|
|
|
|
|
@@ -356,6 +366,12 @@ fi
|
|
|
#===============================================================================
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Sep 21 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 24.0-1
|
|
|
+- new upstream release
|
|
|
+- remove BuildRequires: nspr-devel, nss-devel
|
|
|
+- add BuildRequires: gstreamer-devel, gstreamer-plugins-base-devel
|
|
|
+- add Patch2000 (thunderbird-24.0-vine6.patch)
|
|
|
+
|
|
|
* Tue Aug 06 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 17.0.8-1
|
|
|
- new upstream release
|
|
|
|
Takemikaduchi