|
|
@@ -1,7 +1,7 @@
|
|
|
# do not include minor version number in MOZILLA_FIVE_HOME
|
|
|
-%global ffmajor 25.0
|
|
|
-%global geckomajor 25.0
|
|
|
-%global ffminor 1
|
|
|
+%global ffmajor 26.0
|
|
|
+%global geckomajor 26.0
|
|
|
+#global ffminor 1
|
|
|
%global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
|
|
|
%define ffdir %{_libdir}/firefox
|
|
|
%global langpackdir %{ffdir}/langpacks
|
|
|
@@ -22,7 +22,7 @@
|
|
|
%define build_vine6 1
|
|
|
%endif
|
|
|
|
|
|
-%define ffrelease 1%{?_dist_release}
|
|
|
+%define ffrelease 2%{?_dist_release}
|
|
|
|
|
|
%define desktop_file_utils_version 0.6
|
|
|
%define nspr_version 4.9.6
|
|
|
@@ -75,10 +75,11 @@ Source1010: firefox-unofficial-branding-fx.tar.bz2
|
|
|
Source2000: firefox-searchplugins-6.0-ja.tar.bz2
|
|
|
|
|
|
# build patches
|
|
|
-Patch0: firefox-16.0-install-dir.patch
|
|
|
+Patch0: firefox-26.0-install-dir.patch
|
|
|
# buildfix
|
|
|
Patch2: mozilla-build.patch
|
|
|
Patch3: firefox-12.0-gcc41-nosse2.patch
|
|
|
+Patch4: firefox-26.0-gcc47.patch
|
|
|
|
|
|
# bugfix
|
|
|
Patch14: firefox-5.0-asciidel.patch
|
|
|
@@ -90,7 +91,8 @@ Patch21: rhbz-911314.patch
|
|
|
Patch22: rhbz-928353.patch
|
|
|
|
|
|
# upstream patch
|
|
|
-
|
|
|
+Patch100: mozilla-837563.patch
|
|
|
+Patch101: mozilla-938730.patch
|
|
|
|
|
|
# customization patches
|
|
|
Patch200: firefox-1.5-default-a4-paper.patch
|
|
|
@@ -148,9 +150,7 @@ BuildRequires: wget
|
|
|
#
|
|
|
BuildRequires: gstreamer-devel
|
|
|
BuildRequires: gstreamer-plugins-devel
|
|
|
-%if %{build_vine7}
|
|
|
BuildRequires: pulseaudio-libs-devel
|
|
|
-%endif
|
|
|
|
|
|
Requires: desktop-file-utils >= %{desktop_file_utils_version}
|
|
|
%if %{build_vine6}
|
|
|
@@ -195,12 +195,15 @@ cd %{tarballdir}
|
|
|
%patch3 -p1 -b .gcc41
|
|
|
%endif
|
|
|
|
|
|
+%if "%{?_dist_release}" >= "vl7"
|
|
|
+%patch4 -p1 -b .gcc47
|
|
|
+%endif
|
|
|
+
|
|
|
%patch14 -p1 -b .asciidel
|
|
|
%patch15 -p1 -b .enable-addons
|
|
|
|
|
|
-#%ifarch %{ix86}
|
|
|
-#%patch22 -p2
|
|
|
-#%endif
|
|
|
+%patch100 -p1 -b .837563
|
|
|
+%patch101 -p1 -b .938730
|
|
|
|
|
|
%patch200 -p1
|
|
|
|
|
|
@@ -453,6 +456,12 @@ fi
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Dec 13 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 26.0-2
|
|
|
+- add patch100,101 from upstream
|
|
|
+
|
|
|
+* Wed Dec 11 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 26.0-1
|
|
|
+- update to 26.0
|
|
|
+
|
|
|
* Sun Nov 17 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 25.0.1-1
|
|
|
- update to 25.0.1
|
|
|
|
daisuke