|
|
@@ -1,7 +1,7 @@
|
|
|
# do not include minor version number in MOZILLA_FIVE_HOME
|
|
|
-%global ffmajor 10.0
|
|
|
-%global geckomajor 10.0
|
|
|
-%global ffminor 2
|
|
|
+%global ffmajor 12.0
|
|
|
+%global geckomajor 12.0
|
|
|
+#global ffminor
|
|
|
%global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
|
|
|
%define ffdir %{_libdir}/firefox
|
|
|
%global langpackdir %{ffdir}/langpacks
|
|
|
@@ -85,12 +85,15 @@ Source2000: firefox-searchplugins-4.0-ja.tar.bz2
|
|
|
|
|
|
# build patches
|
|
|
Patch0: firefox-install-dir.patch
|
|
|
+# buildfix
|
|
|
+Patch1: firefox-12.0-buildfix-with-system-cairo.patch
|
|
|
|
|
|
# bugfix
|
|
|
Patch14: firefox-5.0-asciidel.patch
|
|
|
#
|
|
|
Patch15: firefox-8.0-enable-addons.patch
|
|
|
|
|
|
+
|
|
|
# customization patches
|
|
|
Patch26: firefox-1.5-default-a4-paper.patch
|
|
|
|
|
|
@@ -179,6 +182,8 @@ cd %{tarballdir}
|
|
|
|
|
|
%patch0 -p2 -b .orig
|
|
|
|
|
|
+%patch1 -p1 -b .fix-system-cairo
|
|
|
+
|
|
|
%patch14 -p1 -b .asciidel
|
|
|
%patch15 -p2 -b .enable-addons
|
|
|
|
|
|
@@ -417,6 +422,10 @@ fi
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Apr 25 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 12.0-1
|
|
|
+- update to 12.0
|
|
|
+- add patch1 to fix build failure with system cairo
|
|
|
+
|
|
|
* Fri Feb 17 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 10.0.2-1
|
|
|
- update to 10.0.2
|
|
|
|
daisuke