|
|
@@ -1,6 +1,6 @@
|
|
|
# do not include minor version number in MOZILLA_FIVE_HOME
|
|
|
-%global ffmajor 14.0
|
|
|
-%global geckomajor 14.0
|
|
|
+%global ffmajor 15.0
|
|
|
+%global geckomajor 15.0
|
|
|
%global ffminor 1
|
|
|
%global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
|
|
|
%define ffdir %{_libdir}/firefox
|
|
|
@@ -31,8 +31,8 @@
|
|
|
%define ffrelease 1%{?_dist_release}
|
|
|
|
|
|
%define desktop_file_utils_version 0.6
|
|
|
-%define nspr_version 4.8.8
|
|
|
-%define nss_version 3.13.1
|
|
|
+%define nspr_version 4.9.2
|
|
|
+%define nss_version 3.13.6
|
|
|
%define cairo_version 1.10.2-2
|
|
|
#%define sqlite3_version 3.7.7.1
|
|
|
%define libjpeg-turbo_version 1.1.0
|
|
|
@@ -79,7 +79,7 @@ Source100: find-external-requires
|
|
|
Source1000: firefox-%{ffversion}-langpacks.tar.bz2
|
|
|
Source1010: firefox-unofficial-branding-fx.tar.bz2
|
|
|
#
|
|
|
-Source2000: firefox-searchplugins-4.0-ja.tar.bz2
|
|
|
+Source2000: firefox-searchplugins-5.0-ja.tar.bz2
|
|
|
|
|
|
# upstream patch
|
|
|
|
|
|
@@ -87,14 +87,13 @@ Source2000: firefox-searchplugins-4.0-ja.tar.bz2
|
|
|
Patch0: firefox-install-dir.patch
|
|
|
# buildfix
|
|
|
Patch1: firefox-12.0-buildfix-with-system-cairo.patch
|
|
|
+Patch2: mozilla-build.patch
|
|
|
Patch3: firefox-12.0-gcc41-nosse2.patch
|
|
|
-# https://bugzilla.mozilla.org/show_bug.cgi?id=736961
|
|
|
-Patch4: firefox-13.0-bz736961.patch
|
|
|
|
|
|
# bugfix
|
|
|
Patch14: firefox-5.0-asciidel.patch
|
|
|
#
|
|
|
-Patch15: firefox-8.0-enable-addons.patch
|
|
|
+Patch15: firefox-15.0-enable-addons.patch
|
|
|
|
|
|
|
|
|
# customization patches
|
|
|
@@ -105,7 +104,7 @@ Patch26: firefox-1.5-default-a4-paper.patch
|
|
|
#Patch1000: firefox-3.6.2-sjisalias.patch
|
|
|
|
|
|
# vine customization patch
|
|
|
-Patch2000: firefox-13.0-vine.patch
|
|
|
+Patch2000: firefox-15.0-vine.patch
|
|
|
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
@@ -120,8 +119,11 @@ BuildRequires: pango-devel
|
|
|
BuildRequires: alsa-lib-devel
|
|
|
BuildRequires: lcms-devel
|
|
|
BuildRequires: libpng-devel
|
|
|
+%if %{build_vine7}
|
|
|
+BuildRequires: nspr-devel >= %{nspr_version}
|
|
|
+BuildRequires: nss-devel >= %{nss_version}
|
|
|
+%endif
|
|
|
%if %{build_vine6}
|
|
|
-#BuildRequires: nspr-devel >= %{nspr_version}
|
|
|
BuildRequires: cairo-devel >= %{cairo_version}
|
|
|
BuildRequires: libjpeg-turbo-devel >= %{libjpeg-turbo_version}
|
|
|
%endif
|
|
|
@@ -139,6 +141,7 @@ BuildRequires: yasm
|
|
|
BuildRequires: unzip
|
|
|
BuildRequires: zip
|
|
|
BuildRequires: bzip2-devel
|
|
|
+BuildRequires: python-devel
|
|
|
|
|
|
Requires: desktop-file-utils >= %{desktop_file_utils_version}
|
|
|
%if %{build_vine6}
|
|
|
@@ -178,14 +181,14 @@ cd %{tarballdir}
|
|
|
%patch0 -p2 -b .orig
|
|
|
|
|
|
%patch1 -p1 -b .fix-system-cairo
|
|
|
+%patch2 -p1 -b .build
|
|
|
|
|
|
%if "%{?_dist_release}" == "vl5"
|
|
|
%patch3 -p1 -b .gcc41
|
|
|
%endif
|
|
|
-%patch4 -p1 -b .bz736961
|
|
|
|
|
|
%patch14 -p1 -b .asciidel
|
|
|
-%patch15 -p2 -b .enable-addons
|
|
|
+%patch15 -p1 -b .enable-addons
|
|
|
|
|
|
%patch26 -p1
|
|
|
|
|
|
@@ -211,7 +214,7 @@ cd %{tarballdir}
|
|
|
echo "ac_add_options --disable-ipc" >> .mozconfig
|
|
|
%endif
|
|
|
|
|
|
-# update searchplugins
|
|
|
+# update <searchplugins
|
|
|
%{__tar} xjvf %{SOURCE2000} -C browser/locales/en-US/
|
|
|
|
|
|
# setup unofficial branding logos
|
|
|
@@ -249,6 +252,9 @@ MOZ_SMP_FLAGS=-j1
|
|
|
[ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4
|
|
|
%endif
|
|
|
|
|
|
+sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \
|
|
|
+ browser/installer/Makefile.in &&
|
|
|
+
|
|
|
export LDFLAGS="-Wl,-rpath,%{ffdir}"
|
|
|
export MAKE="gmake $MOZ_SMP_FLAGS"
|
|
|
%__make -f client.mk configure
|
|
|
@@ -423,6 +429,14 @@ fi
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Oct 06 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 15.0.1-1
|
|
|
+- update to 15.0.1
|
|
|
+- add BR: python-devel
|
|
|
+- build with external nss/nspr on Vine7
|
|
|
+
|
|
|
+* Tue Jul 17 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 14.0.1-2
|
|
|
+- update search plugins
|
|
|
+
|
|
|
* Tue Jul 17 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 14.0.1-1
|
|
|
- update to 14.0.1
|
|
|
- build with internal nss/nspr
|
daisuke