|
|
@@ -1,6 +1,6 @@
|
|
|
# do not include minor version number in MOZILLA_FIVE_HOME
|
|
|
-%global ffmajor 13.0
|
|
|
-%global geckomajor 13.0
|
|
|
+%global ffmajor 14.0
|
|
|
+%global geckomajor 14.0
|
|
|
%global ffminor 1
|
|
|
%global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
|
|
|
%define ffdir %{_libdir}/firefox
|
|
|
@@ -87,15 +87,9 @@ Source2000: firefox-searchplugins-4.0-ja.tar.bz2
|
|
|
Patch0: firefox-install-dir.patch
|
|
|
# buildfix
|
|
|
Patch1: firefox-12.0-buildfix-with-system-cairo.patch
|
|
|
-# fix build failure with gcc-4.4
|
|
|
-# http://forums.mozillazine.org/viewtopic.php?f=42&t=2462003
|
|
|
-# https://bugzilla.mozilla.org/show_bug.cgi?id=621446
|
|
|
-Patch2: firefox-12.0-gcc44.patch
|
|
|
Patch3: firefox-12.0-gcc41-nosse2.patch
|
|
|
# https://bugzilla.mozilla.org/show_bug.cgi?id=736961
|
|
|
Patch4: firefox-13.0-bz736961.patch
|
|
|
-# https://bugzilla.mozilla.org/show_bug.cgi?id=736836
|
|
|
-Patch5: firefox-13.0-buildfix-nspr.patch
|
|
|
|
|
|
# bugfix
|
|
|
Patch14: firefox-5.0-asciidel.patch
|
|
|
@@ -126,13 +120,8 @@ BuildRequires: pango-devel
|
|
|
BuildRequires: alsa-lib-devel
|
|
|
BuildRequires: lcms-devel
|
|
|
BuildRequires: libpng-devel
|
|
|
-%if %{build_vine7}
|
|
|
-BuildRequires: nss-devel >= %{nss_version}
|
|
|
-#BuildRequires: sqlite3-devel >= %{sqlite3_version}
|
|
|
-#BuildRequires: libvpx-devel >= 0.9.7
|
|
|
-%endif
|
|
|
%if %{build_vine6}
|
|
|
-BuildRequires: nspr-devel >= %{nspr_version}
|
|
|
+#BuildRequires: nspr-devel >= %{nspr_version}
|
|
|
BuildRequires: cairo-devel >= %{cairo_version}
|
|
|
BuildRequires: libjpeg-turbo-devel >= %{libjpeg-turbo_version}
|
|
|
%endif
|
|
|
@@ -152,11 +141,8 @@ BuildRequires: zip
|
|
|
BuildRequires: bzip2-devel
|
|
|
|
|
|
Requires: desktop-file-utils >= %{desktop_file_utils_version}
|
|
|
-%if %{build_vine7}
|
|
|
-Requires: nss >= %{nss_version}
|
|
|
-%endif
|
|
|
%if %{build_vine6}
|
|
|
-Requires: nspr >= %{nspr_version}
|
|
|
+#Requires: nspr >= %{nspr_version}
|
|
|
%endif
|
|
|
%if %{build_vine5}
|
|
|
#Requires: gecko-libs >= %{gecko_version}
|
|
|
@@ -193,12 +179,10 @@ cd %{tarballdir}
|
|
|
|
|
|
%patch1 -p1 -b .fix-system-cairo
|
|
|
|
|
|
-%patch2 -p1 -b .gcc44
|
|
|
%if "%{?_dist_release}" == "vl5"
|
|
|
%patch3 -p1 -b .gcc41
|
|
|
%endif
|
|
|
%patch4 -p1 -b .bz736961
|
|
|
-%patch5 -p1 -b .buildfix-nspr
|
|
|
|
|
|
%patch14 -p1 -b .asciidel
|
|
|
%patch15 -p2 -b .enable-addons
|
|
|
@@ -278,7 +262,8 @@ cd %{tarballdir}
|
|
|
|
|
|
# set up our prefs and add it to the package manifest file, so it gets pulled in
|
|
|
# to omni.jar which gets created during make install
|
|
|
-%{__cat} %{SOURCE12} | sed -e 's,FIREFOX_RPM_VR,%{version}-%{release},g' > dist/bin/defaults/pref/all-vine.js
|
|
|
+%{__cat} %{SOURCE12} | \
|
|
|
+ sed -e 's,FIREFOX_RPM_VR,%{version}-%{release},g' > dist/bin/defaults/preferences/all-vine.js
|
|
|
# This sed call "replaces" firefox.js with all-vine.js, newline, and itself (&)
|
|
|
# having the net effect of prepending all-vine.js above firefox.js
|
|
|
%{__sed} -i -e\
|
|
|
@@ -438,6 +423,10 @@ fi
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Jul 17 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 14.0.1-1
|
|
|
+- update to 14.0.1
|
|
|
+- build with internal nss/nspr
|
|
|
+
|
|
|
* Sat Jun 16 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 13.0.1-1
|
|
|
- update to 13.0.1
|
|
|
|
daisuke