|
|
@@ -1,6 +1,6 @@
|
|
|
# do not include minor version number in MOZILLA_FIVE_HOME
|
|
|
-%global ffmajor 12.0
|
|
|
-%global geckomajor 12.0
|
|
|
+%global ffmajor 13.0
|
|
|
+%global geckomajor 13.0
|
|
|
#global ffminor
|
|
|
%global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
|
|
|
%define ffdir %{_libdir}/firefox
|
|
|
@@ -28,7 +28,7 @@
|
|
|
%define build_vine5 1
|
|
|
%endif
|
|
|
|
|
|
-%define ffrelease 2%{?_dist_release}
|
|
|
+%define ffrelease 1%{?_dist_release}
|
|
|
|
|
|
%define desktop_file_utils_version 0.6
|
|
|
%define nspr_version 4.8.8
|
|
|
@@ -91,6 +91,11 @@ Patch1: firefox-12.0-buildfix-with-system-cairo.patch
|
|
|
# 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
|
|
|
@@ -106,7 +111,7 @@ Patch26: firefox-1.5-default-a4-paper.patch
|
|
|
#Patch1000: firefox-3.6.2-sjisalias.patch
|
|
|
|
|
|
# vine customization patch
|
|
|
-Patch2000: firefox-5.0-vine.patch
|
|
|
+Patch2000: firefox-13.0-vine.patch
|
|
|
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
@@ -189,6 +194,11 @@ 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
|
|
|
@@ -428,6 +438,12 @@ fi
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Jun 06 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 13.0-1
|
|
|
+- update to 13.0
|
|
|
+
|
|
|
+* Sun May 20 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 12.0-3
|
|
|
+- add patch2 to fix build failure with gcc-4.1 (vine5)
|
|
|
+
|
|
|
* Mon May 07 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 12.0-2
|
|
|
- use internal nspr on Vine Linux 6
|
|
|
- add patch2 to fix build failure with gcc-4.4
|
daisuke