|
|
@@ -1,6 +1,6 @@
|
|
|
# do not include minor version number in MOZILLA_FIVE_HOME
|
|
|
-%global ffmajor 30.0
|
|
|
-%global geckomajor 30.0
|
|
|
+%global ffmajor 31.0
|
|
|
+%global geckomajor 31.0
|
|
|
#global ffminor 1
|
|
|
%global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
|
|
|
%define ffdir %{_libdir}/firefox
|
|
|
@@ -80,6 +80,9 @@ Patch0: firefox-26.0-install-dir.patch
|
|
|
Patch3: firefox-12.0-gcc41-nosse2.patch
|
|
|
Patch4: firefox-26.0-gcc47.patch
|
|
|
|
|
|
+# to build on vine6
|
|
|
+Patch5: firefox-31.0-gcc44.patch
|
|
|
+
|
|
|
# bugfix
|
|
|
#Patch14: firefox-5.0-asciidel.patch
|
|
|
#
|
|
|
@@ -152,9 +155,6 @@ BuildRequires: gstreamer-plugins-devel
|
|
|
BuildRequires: pulseaudio-libs-devel
|
|
|
|
|
|
Requires: desktop-file-utils >= %{desktop_file_utils_version}
|
|
|
-%if %{build_vine6}
|
|
|
-#Requires: nspr >= %{nspr_version}
|
|
|
-%endif
|
|
|
|
|
|
Obsoletes: phoenix, mozilla-firebird, MozillaFirebird
|
|
|
Obsoletes: firefox3
|
|
|
@@ -189,14 +189,14 @@ cd %{tarballdir}
|
|
|
|
|
|
%patch0 -p1 -b .install-dir
|
|
|
|
|
|
-%if "%{?_dist_release}" == "vl5"
|
|
|
-%patch3 -p1 -b .gcc41
|
|
|
-%endif
|
|
|
-
|
|
|
%if "%{?_dist_release}" >= "vl7"
|
|
|
%patch4 -p1 -b .gcc47
|
|
|
%endif
|
|
|
|
|
|
+%if "%{?_dist_release}" >= "vl6"
|
|
|
+%patch5 -p1 -b .gcc44
|
|
|
+%endif
|
|
|
+
|
|
|
#%patch14 -p1 -b .asciidel
|
|
|
%patch15 -p1 -b .enable-addons
|
|
|
|
|
|
@@ -455,7 +455,10 @@ fi
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
%changelog
|
|
|
-* Wed Jun 11 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 30.0
|
|
|
+* Wed Jul 23 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 31.0-1
|
|
|
+- update to 31.0
|
|
|
+
|
|
|
+* Wed Jun 11 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 30.0-1
|
|
|
- update to 30.0
|
|
|
|
|
|
* Thu May 15 2014 Daisuke SUZUKI <daisuke@linux.or.jp> 29.0.1-1
|
daisuke