|
@@ -1,6 +1,6 @@
|
|
|
# do not include minor version number in MOZILLA_FIVE_HOME
|
|
|
-%global ffmajor 23.0
|
|
|
-%global geckomajor 23.0
|
|
|
+%global ffmajor 24.0
|
|
|
+%global geckomajor 24.0
|
|
|
#global ffminor 1
|
|
|
%global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
|
|
|
%define ffdir %{_libdir}/firefox
|
|
@@ -22,7 +22,7 @@
|
|
|
%define build_vine6 1
|
|
|
%endif
|
|
|
|
|
|
-%define ffrelease 2%{?_dist_release}
|
|
|
+%define ffrelease 1%{?_dist_release}
|
|
|
|
|
|
%define desktop_file_utils_version 0.6
|
|
|
%define nspr_version 4.9.6
|
|
@@ -72,12 +72,11 @@ Source100: find-external-requires
|
|
|
Source1000: firefox-%{ffversion}-langpacks.tar.bz2
|
|
|
Source1010: firefox-unofficial-branding-fx.tar.bz2
|
|
|
#
|
|
|
-Source2000: firefox-searchplugins-5.0-ja.tar.bz2
|
|
|
+Source2000: firefox-searchplugins-6.0-ja.tar.bz2
|
|
|
|
|
|
# build patches
|
|
|
Patch0: firefox-16.0-install-dir.patch
|
|
|
# buildfix
|
|
|
-Patch1: firefox-12.0-buildfix-with-system-cairo.patch
|
|
|
Patch2: mozilla-build.patch
|
|
|
Patch3: firefox-12.0-gcc41-nosse2.patch
|
|
|
|
|
@@ -100,7 +99,7 @@ Patch200: firefox-1.5-default-a4-paper.patch
|
|
|
#Patch1000: firefox-19.0-disable-pdfjs.patch
|
|
|
|
|
|
# vine customization patch
|
|
|
-Patch2000: firefox-23.0-vine.patch
|
|
|
+Patch2000: firefox-24.0-vine.patch
|
|
|
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
@@ -146,6 +145,9 @@ BuildRequires: python27
|
|
|
%endif
|
|
|
BuildRequires: curl-devel
|
|
|
BuildRequires: wget
|
|
|
+#
|
|
|
+BuildRequires: gstreamer-devel
|
|
|
+BuildRequires: gstreamer-plugins-devel
|
|
|
|
|
|
Requires: desktop-file-utils >= %{desktop_file_utils_version}
|
|
|
%if %{build_vine6}
|
|
@@ -184,7 +186,6 @@ FX ウェブブラウザは Mozilla テクノロジーをベースとしたオ
|
|
|
cd %{tarballdir}
|
|
|
|
|
|
%patch0 -p1 -b .install-dir
|
|
|
-%patch1 -p1 -b .fix-system-cairo
|
|
|
%patch2 -p1 -b .build
|
|
|
|
|
|
%if "%{?_dist_release}" == "vl5"
|
|
@@ -449,6 +450,11 @@ fi
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Sep 17 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 24.0-1
|
|
|
+- update to 24.0
|
|
|
+- update searchplugins
|
|
|
+- add BR: gstreamer-devel, gstreamer-plugins-devel
|
|
|
+
|
|
|
* Wed Aug 07 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 23.0-2
|
|
|
- fix vine customize patch
|
|
|
- update unofficial logos
|