|
|
@@ -1,7 +1,7 @@
|
|
|
# do not include minor version number in MOZILLA_FIVE_HOME
|
|
|
-%global ffmajor 15.0
|
|
|
-%global geckomajor 15.0
|
|
|
-%global ffminor 1
|
|
|
+%global ffmajor 16.0
|
|
|
+%global geckomajor 16.0
|
|
|
+#global ffminor 1
|
|
|
%global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
|
|
|
%define ffdir %{_libdir}/firefox
|
|
|
%global langpackdir %{ffdir}/langpacks
|
|
|
@@ -47,6 +47,9 @@ ExclusiveArch: i386 i586 i686 x86_64 ia64 ppc
|
|
|
%else
|
|
|
%define separated_plugins 0
|
|
|
%endif
|
|
|
+%if "%{?_dist_release}" == "vl6"
|
|
|
+%define separated_plugins 0
|
|
|
+%endif
|
|
|
|
|
|
Summary: Fx Browser
|
|
|
Summary(ja): Fx ウェブブラウザ
|
|
|
@@ -84,7 +87,7 @@ Source2000: firefox-searchplugins-5.0-ja.tar.bz2
|
|
|
# upstream patch
|
|
|
|
|
|
# build patches
|
|
|
-Patch0: firefox-install-dir.patch
|
|
|
+Patch0: firefox-16.0-install-dir.patch
|
|
|
# buildfix
|
|
|
Patch1: firefox-12.0-buildfix-with-system-cairo.patch
|
|
|
Patch2: mozilla-build.patch
|
|
|
@@ -178,8 +181,7 @@ FX ウェブブラウザは Mozilla テクノロジーをベースとしたオ
|
|
|
%setup -q -n %{name}-%{version} -c
|
|
|
cd %{tarballdir}
|
|
|
|
|
|
-%patch0 -p2 -b .orig
|
|
|
-
|
|
|
+%patch0 -p1 -b .install-dir
|
|
|
%patch1 -p1 -b .fix-system-cairo
|
|
|
%patch2 -p1 -b .build
|
|
|
|
|
|
@@ -210,11 +212,13 @@ cd %{tarballdir}
|
|
|
|
|
|
#echo "ac_add_options --with-libxul-sdk=`pkg-config --variable=sdkdir libxul`" >> .mozconfig
|
|
|
|
|
|
+echo "ac_add_options --with-default-mozilla-five-home=%{ffdir}" >> .mozconfig
|
|
|
+
|
|
|
%if !%{?separated_plugins}
|
|
|
echo "ac_add_options --disable-ipc" >> .mozconfig
|
|
|
%endif
|
|
|
|
|
|
-# update <searchplugins
|
|
|
+# update searchplugins
|
|
|
%{__tar} xjvf %{SOURCE2000} -C browser/locales/en-US/
|
|
|
|
|
|
# setup unofficial branding logos
|
|
|
@@ -229,7 +233,7 @@ echo "ac_add_options --disable-ipc" >> .mozconfig
|
|
|
cd %{tarballdir}
|
|
|
autoconf-2.13
|
|
|
|
|
|
-MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | \
|
|
|
+MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \
|
|
|
%{__sed} -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')
|
|
|
export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
|
|
|
export CFLAGS=$MOZ_OPT_FLAGS
|
|
|
@@ -255,10 +259,18 @@ MOZ_SMP_FLAGS=-j1
|
|
|
sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \
|
|
|
browser/installer/Makefile.in &&
|
|
|
|
|
|
+find security/nss/lib -name "*.def" | while read i
|
|
|
+do
|
|
|
+ mv $i $i.orig
|
|
|
+ grep -v ';-' $i.orig | \
|
|
|
+ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $i
|
|
|
+done
|
|
|
+
|
|
|
export LDFLAGS="-Wl,-rpath,%{ffdir}"
|
|
|
export MAKE="gmake $MOZ_SMP_FLAGS"
|
|
|
%__make -f client.mk configure
|
|
|
-%__make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
|
|
|
+%__make -f client.mk build STRIP="/bin/true" \
|
|
|
+ MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
|
|
|
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
@@ -429,6 +441,16 @@ fi
|
|
|
#---------------------------------------------------------------------
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Oct 09 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 16.0-1
|
|
|
+- update to 16.0
|
|
|
+
|
|
|
+* Tue Oct 09 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 15.0.1-3
|
|
|
+- dont use separated plugins on Vine6
|
|
|
+- use --enable-optimize instead of --enable-optimize="\$RPM_OPT_FLAGS"
|
|
|
+
|
|
|
+* Mon Oct 08 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 15.0.1-2
|
|
|
+- add workaround to build with internal nss library
|
|
|
+
|
|
|
* Sat Oct 06 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 15.0.1-1
|
|
|
- update to 15.0.1
|
|
|
- add BR: python-devel
|
daisuke