firefox:

- update to 18.0
- R: nss >= 3.14.1, nspr >= 4.9.4
- Conflicts: xulrunner < 17.0.1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7317 ec354946-7b23-47d6-9f5a-488ba84defc7

f/firefox/firefox-vl.spec

@@ -1,6 +1,6 @@
 # do not include minor version number in MOZILLA_FIVE_HOME
-%global ffmajor 17.0
+%global ffmajor 18.0
-%global geckomajor 17.0
+%global geckomajor 18.0
 #global ffminor 
 %global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
 %define ffdir %{_libdir}/firefox
@@ -31,8 +31,8 @@
 %define ffrelease 1%{?_dist_release}
 
 %define desktop_file_utils_version 0.6
-%define nspr_version 4.9.2
+%define nspr_version 4.9.4
-%define nss_version 3.13.6
+%define nss_version 3.14.1
 %define cairo_version 1.10.2-2
 #%define sqlite3_version 3.7.7.1
 %define libjpeg-turbo_version 1.1.0
@@ -125,6 +125,8 @@ BuildRequires:  libpng-devel
 %if %{build_vine7}
 BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  nss-devel >= %{nss_version}
+Requires: nss >= %{nss_version}
+Requires: nspr >= %{nspr_version}
 %endif
 %if %{build_vine6}
 BuildRequires:  cairo-devel >= %{cairo_version}
@@ -159,6 +161,10 @@ Obsoletes:      firefox3
 Conflicts:	firefox-esr
 Provides:       webclient
 
+%if %{build_vine7}
+Conflicts:      xulrunner < 17.0.1
+%endif
+
 AutoProv: 0
 %define _use_internal_dependency_generator 0
 %define __find_requires %{SOURCE100}
@@ -233,8 +239,8 @@ echo "ac_add_options --disable-ipc" >> .mozconfig
 cd %{tarballdir}
 autoconf-2.13
 
-MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \
+MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | \
-                %{__sed} -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')
+                %{__sed} -e 's/-Wall//')
 export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
 export CFLAGS=$MOZ_OPT_FLAGS
 export CXXFLAGS=$MOZ_OPT_FLAGS
@@ -259,6 +265,9 @@ MOZ_SMP_FLAGS=-j1
 sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \
   browser/installer/Makefile.in &&
 
+# https://bugzilla.mozilla.org/show_bug.cgi?id=824381
+mkdir js/src/.deps
+
 find security/nss/lib -name "*.def" | while read i
 do
   mv $i $i.orig
@@ -441,6 +450,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Jan 09 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 18.0-1
+- update to 18.0
+
 * Wed Nov 21 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 17.0-1
 - update to 17.0