|
@@ -1,5 +1,5 @@
|
|
# do not include minor version number in MOZILLA_FIVE_HOME
|
|
# do not include minor version number in MOZILLA_FIVE_HOME
|
|
-%define tbmajor 10.0.2
|
|
|
|
|
|
+%define tbmajor 11.0
|
|
#%define tbversion %{tbmajor}.10
|
|
#%define tbversion %{tbmajor}.10
|
|
%define tbversion %{tbmajor}
|
|
%define tbversion %{tbmajor}
|
|
%define tbrelease 1%{?_dist_release}
|
|
%define tbrelease 1%{?_dist_release}
|
|
@@ -18,8 +18,8 @@
|
|
%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
|
|
%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
|
|
|
|
|
|
%define desktop_file_utils_version 0.6
|
|
%define desktop_file_utils_version 0.6
|
|
-%define nspr_version 4.8
|
|
|
|
-%define nss_version 3.13.1
|
|
|
|
|
|
+%define nspr_version 4.9
|
|
|
|
+%define nss_version 3.13.2
|
|
%define cairo_version 1.6.0
|
|
%define cairo_version 1.6.0
|
|
%define freetype_version 2.1.9
|
|
%define freetype_version 2.1.9
|
|
%define sqlite_version 3.6.14
|
|
%define sqlite_version 3.6.14
|
|
@@ -92,7 +92,6 @@ BuildRequires: nss-devel >= %{nss_version}
|
|
BuildRequires: hunspell-devel
|
|
BuildRequires: hunspell-devel
|
|
%endif
|
|
%endif
|
|
%if %{build_vine6}
|
|
%if %{build_vine6}
|
|
-BuildRequires: nspr-devel >= %{nspr_version}
|
|
|
|
BuildRequires: hunspell-devel
|
|
BuildRequires: hunspell-devel
|
|
%endif
|
|
%endif
|
|
BuildRequires: pixman-devel
|
|
BuildRequires: pixman-devel
|
|
@@ -186,10 +185,19 @@ INTERNAL_GECKO=%{version_internal}
|
|
MOZ_APP_DIR=%{mozappdir}
|
|
MOZ_APP_DIR=%{mozappdir}
|
|
|
|
|
|
|
|
|
|
|
|
+%if %{build_vine7}
|
|
|
|
+MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %__sed -e 's/-Wall//')
|
|
|
|
+%else
|
|
|
|
+%ifarch x86_64
|
|
#MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %__sed -e 's/-O2/-Os/' -e 's/-Wall//')
|
|
#MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %__sed -e 's/-O2/-Os/' -e 's/-Wall//')
|
|
|
|
+MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %__sed -e 's/-O2//' -e 's/-Wall//')
|
|
|
|
+%else
|
|
MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %__sed -e 's/-Wall//')
|
|
MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %__sed -e 's/-Wall//')
|
|
|
|
+%endif
|
|
|
|
+%endif
|
|
export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
|
|
export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
|
|
export CFLAGS="$RPM_OPT_FLAGS"
|
|
export CFLAGS="$RPM_OPT_FLAGS"
|
|
|
|
+#export CFLAGS=""
|
|
export CXXFLAGS="$CFLAGS"
|
|
export CXXFLAGS="$CFLAGS"
|
|
export MOZ_APP_DISPLAYNAME="Tb for Vine Linux"
|
|
export MOZ_APP_DISPLAYNAME="Tb for Vine Linux"
|
|
|
|
|
|
@@ -347,6 +355,10 @@ fi
|
|
#===============================================================================
|
|
#===============================================================================
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sun Mar 18 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 11.0-1
|
|
|
|
+- new upstream release
|
|
|
|
+- update Source1020 (mozconfig-thunderbird-vine6)
|
|
|
|
+
|
|
* Fri Feb 17 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 10.0.2-1
|
|
* Fri Feb 17 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 10.0.2-1
|
|
- new upstream release
|
|
- new upstream release
|
|
|
|
|