|
|
@@ -1,7 +1,7 @@
|
|
|
# do not include minor version number in MOZILLA_FIVE_HOME
|
|
|
-%global ffmajor 33.0
|
|
|
-%global geckomajor 33.0
|
|
|
-#global ffminor 0
|
|
|
+%global ffmajor 37.0
|
|
|
+%global geckomajor 37.0
|
|
|
+%global ffminor 1
|
|
|
%global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
|
|
|
%define ffdir %{_libdir}/firefox
|
|
|
%global langpackdir %{ffdir}/langpacks
|
|
|
@@ -72,12 +72,13 @@ Source2000: firefox-searchplugins-6.0-ja.tar.bz2
|
|
|
|
|
|
# build patches
|
|
|
Patch0: firefox-26.0-install-dir.patch
|
|
|
+Patch1: firefox-build.patch
|
|
|
# buildfix
|
|
|
Patch3: firefox-12.0-gcc41-nosse2.patch
|
|
|
-Patch4: firefox-26.0-gcc47.patch
|
|
|
+#Patch4: firefox-26.0-gcc47.patch
|
|
|
|
|
|
# to build on vine6
|
|
|
-Patch5: firefox-33.0-gcc44.patch
|
|
|
+#Patch5: firefox-34.0-gcc44.patch
|
|
|
|
|
|
# bugfix
|
|
|
#Patch14: firefox-5.0-asciidel.patch
|
|
|
@@ -93,13 +94,12 @@ Patch22: rhbz-928353.patch
|
|
|
Patch101: mozilla-938730.patch
|
|
|
|
|
|
# customization patches
|
|
|
-Patch200: firefox-1.5-default-a4-paper.patch
|
|
|
|
|
|
## Vine patch
|
|
|
#Patch1000: firefox-19.0-disable-pdfjs.patch
|
|
|
|
|
|
# vine customization patch
|
|
|
-Patch2000: firefox-24.0-vine.patch
|
|
|
+Patch2000: firefox-34.0-vine.patch
|
|
|
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
@@ -177,13 +177,13 @@ cd %{tarballdir}
|
|
|
|
|
|
%patch0 -p1 -b .install-dir
|
|
|
|
|
|
-%if "%{?_dist_release}" >= "vl7"
|
|
|
-%patch4 -p1 -b .gcc47
|
|
|
-%endif
|
|
|
+#%if "%{?_dist_release}" >= "vl7"
|
|
|
+#%patch4 -p1 -b .gcc47
|
|
|
+#%endif
|
|
|
|
|
|
-%if "%{?_dist_release}" >= "vl6"
|
|
|
-%patch5 -p1 -b .gcc44
|
|
|
-%endif
|
|
|
+#%if "%{?_dist_release}" >= "vl6"
|
|
|
+#%patch5 -p1 -b .gcc44
|
|
|
+#%endif
|
|
|
|
|
|
#%patch14 -p1 -b .asciidel
|
|
|
%patch15 -p1 -b .enable-addons
|
|
|
@@ -191,8 +191,6 @@ cd %{tarballdir}
|
|
|
#%patch100 -p1 -b .837563
|
|
|
#%patch101 -p1 -b .938730
|
|
|
|
|
|
-%patch200 -p1
|
|
|
-
|
|
|
#
|
|
|
#patch1000 -p1 -b .disable-pdfjs
|
|
|
%patch2000 -p1 -b .vine
|
|
|
@@ -205,11 +203,12 @@ cd %{tarballdir}
|
|
|
%{__cp} -f %{SOURCE230} .mozconfig
|
|
|
%endif
|
|
|
|
|
|
-%if %build_vine7
|
|
|
-%ifarch %ix86
|
|
|
+#%if %build_vine7
|
|
|
+#%ifarch %ix86
|
|
|
+#sed -i -e 's/enable-optimize/disable-optimize/g' .mozconfig
|
|
|
+#%endif
|
|
|
+#%endif
|
|
|
sed -i -e 's/enable-optimize/disable-optimize/g' .mozconfig
|
|
|
-%endif
|
|
|
-%endif
|
|
|
|
|
|
#echo "ac_add_options --with-libxul-sdk=`pkg-config --variable=sdkdir libxul`" >> .mozconfig
|
|
|
|
|
|
@@ -450,6 +449,36 @@ fi
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Apr 12 2015 Daisuke SUZUKI <daisuke@vinelinux.org> 37.0.1-1
|
|
|
+- update to 37.0.1
|
|
|
+
|
|
|
+* Sat Apr 4 2015 Daisuke SUZUKI <daisuke@vinelinux.org> 37.0-1
|
|
|
+- update to 37.0
|
|
|
+
|
|
|
+* Sun Mar 29 2015 Daisuke SUZUKI <daisuke@vinelinux.org> 36.0.4-1
|
|
|
+- update to 36.0.4
|
|
|
+
|
|
|
+* Wed Mar 11 2015 Daisuke SUZUKI <daisuke@vinelinux.org> 36.0.1-1
|
|
|
+- update to 36.0.1
|
|
|
+
|
|
|
+* Tue Mar 03 2015 Daisuke SUZUKI <daisuke@vinelinux.org> 36.0-1
|
|
|
+- update to 36.0
|
|
|
+
|
|
|
+* Mon Feb 02 2015 Daisuke SUZUKI <daisuke@vinelinux.org> 35.0.1-1
|
|
|
+- update to 35.0.1
|
|
|
+
|
|
|
+* Sun Jan 18 2015 Daisuke SUZUKI <daisuke@vinelinux.org> 35.0-1
|
|
|
+- update to 35.0
|
|
|
+
|
|
|
+* Wed Dec 03 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 34.0.5-1
|
|
|
+- update to 34.0.5
|
|
|
+
|
|
|
+* Tue Nov 11 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 33.1-1
|
|
|
+- update to 33.1
|
|
|
+
|
|
|
+* Mon Nov 10 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 33.0.3-1
|
|
|
+- update to 33.0.3
|
|
|
+
|
|
|
* Tue Oct 14 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 33.0-1
|
|
|
- update to 33.0
|
|
|
|
daisuke