firefox: update to 20.0.1

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

f/firefox/firefox-vl.spec

@@ -1,7 +1,7 @@
 # do not include minor version number in MOZILLA_FIVE_HOME
-%global ffmajor 19.0
-%global geckomajor 19.0
-%global ffminor 2
+%global ffmajor 20.0
+%global geckomajor 20.0
+%global ffminor 1
 %global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
 %define ffdir %{_libdir}/firefox
 %global langpackdir %{ffdir}/langpacks
@@ -12,27 +12,21 @@
 
 %define build_vine7 0
 %define build_vine6 0
-%define build_vine5 0
 
 # current firefox3 doesn't build on Vine Linux 4.x or older.
 %if "%{?_dist_release}" == "vl7"
 %define build_vine7 1
 %define build_vine6 1
-%define build_vine5 1
 %endif
 %if "%{?_dist_release}" == "vl6"
 %define build_vine6 1
-%define build_vine5 1
-%endif
-%if "%{?_dist_release}" == "vl5"
-%define build_vine5 1
 %endif
 
 %define ffrelease 2%{?_dist_release}
 
 %define desktop_file_utils_version 0.6
-%define nspr_version 4.9.4
-%define nss_version 3.14.1
+%define nspr_version 4.9.6
+%define nss_version 3.14.3
 %define cairo_version 1.10.2-2
 #%define sqlite3_version 3.7.7.1
 %define libjpeg-turbo_version 1.1.0
@@ -47,9 +41,6 @@ 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 ウェブブラウザ
@@ -61,7 +52,6 @@ License:        MPL/LGPL
 Group:          Applications/Internet
 Source0:        firefox-%{version}.source.tar.bz2
 
-Source220:       mozconfig-firefox-vine5
 Source230:       mozconfig-firefox-vine6
 Source240:       mozconfig-firefox-vine7
 
@@ -84,8 +74,6 @@ Source1010:     firefox-unofficial-branding-fx.tar.bz2
 #
 Source2000:     firefox-searchplugins-5.0-ja.tar.bz2
 
-# upstream patch
-
 # build patches
 Patch0:		firefox-16.0-install-dir.patch
 # buildfix
@@ -98,17 +86,24 @@ Patch14:	firefox-5.0-asciidel.patch
 # 
 Patch15:	firefox-15.0-enable-addons.patch
 
-#
-Patch16:	mozilla-239254.patch
+# patches from fedora
+Patch21:        rhbz-911314.patch
+Patch22:        rhbz-928353.patch
+
+# upstream patch
+Patch101:       mozilla-791626.patch
+Patch102:       mozilla-239254.patch
+Patch104:       mozilla-844883.patch
+
 
 # customization patches
-Patch26:	firefox-1.5-default-a4-paper.patch
+Patch200:	firefox-1.5-default-a4-paper.patch
 
 ## Vine patch
 Patch1000:      firefox-19.0-disable-pdfjs.patch
 
 # vine customization patch
-Patch2000:      firefox-17.0-vine.patch
+Patch2000:      firefox-20.0-vine.patch
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -124,23 +119,21 @@ BuildRequires:	alsa-lib-devel
 BuildRequires:  lcms-devel
 BuildRequires:  libpng-devel
 %if %{build_vine7}
-BuildRequires:  nspr-devel >= %{nspr_version}
-BuildRequires:  nss-devel >= %{nss_version}
-Requires: nss >= %{nss_version}
-Requires: nspr >= %{nspr_version}
+#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}
 BuildRequires:  libjpeg-turbo-devel >= %{libjpeg-turbo_version}
 %endif
-%if %{build_vine5}
 #BuildRequires:  gecko-devel = %{gecko_version}
 BuildRequires:  libnotify-devel
 BuildRequires:	libXt-devel
 BuildRequires:	libXrender-devel
 BuildRequires:  libXScrnSaver-devel
 BuildRequires:  startup-notification-devel
-%endif
 BuildRequires:  autoconf213
 BuildRequires:  freetype2-devel
 BuildRequires:  yasm
@@ -148,14 +141,13 @@ BuildRequires:  unzip
 BuildRequires:  zip
 BuildRequires:  bzip2-devel
 BuildRequires:  python-devel
+BuildRequires:  curl-devel
+BuildRequires:  wget
 
 Requires:       desktop-file-utils >= %{desktop_file_utils_version}
 %if %{build_vine6}
 #Requires:	nspr >= %{nspr_version}
 %endif
-%if %{build_vine5}
-#Requires:       gecko-libs >= %{gecko_version}
-%endif
 
 Obsoletes:      phoenix, mozilla-firebird, MozillaFirebird
 Obsoletes:      firefox3
@@ -199,9 +191,14 @@ cd %{tarballdir}
 %patch14 -p1 -b .asciidel
 %patch15 -p1 -b .enable-addons
 
-%patch16 -p1 -b .239254
+#%ifarch %{ix86}
+#%patch22  -p2
+#%endif
 
-%patch26 -p1
+%patch101 -p1 -b .791626
+%patch102 -p1 -b .239254
+
+%patch200 -p1
 
 #
 %patch1000 -p1 -b .disable-pdfjs
@@ -212,11 +209,7 @@ cd %{tarballdir}
 %if %build_vine7
 %{__cp} %{SOURCE240} .mozconfig
 %else
-%if %build_vine6
 %{__cp} -f %{SOURCE230} .mozconfig
-%else
-%{__cp} -f %{SOURCE220} .mozconfig
-%endif
 %endif
 
 #echo "ac_add_options --with-libxul-sdk=`pkg-config --variable=sdkdir libxul`" >> .mozconfig
@@ -269,7 +262,7 @@ 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
+mkdir -p js/src/.deps
 
 find security/nss/lib -name "*.def" | while read i
 do
@@ -279,10 +272,7 @@ do
 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 MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
 
 #---------------------------------------------------------------------
 
@@ -292,8 +282,9 @@ cd %{tarballdir}
 
 # set up our prefs and add it to the package manifest file, so it gets pulled in
 # to omni.jar which gets created during make install
+%global MOZ_PREF_DIR defaults/pref
 %{__cat} %{SOURCE12} | \
-  sed -e 's,FIREFOX_RPM_VR,%{version}-%{release},g' > dist/bin/defaults/preferences/all-vine.js
+  sed -e 's,FIREFOX_RPM_VR,%{version}-%{release},g' > objdir/dist/bin/%{MOZ_PREF_DIR}/all-vine.js
 # This sed call "replaces" firefox.js with all-vine.js, newline, and itself (&)
 # having the net effect of prepending all-vine.js above firefox.js
 %{__sed} -i -e\
@@ -305,12 +296,12 @@ cd %{tarballdir}
 %{__install} -p -D -m 664 %{SOURCE11} $RPM_BUILD_ROOT%{ffdir}/defaults/profile/bookmarks.html
 
 # Make sure locale works for langpacks
-%{__cat} > dist/bin/defaults/pref/firefox-l10n.js << EOF
+%{__cat} > objdir/dist/bin/%{MOZ_PREF_DIR}/firefox-l10n.js << EOF
 pref("general.useragent.locale", "chrome://global/locale/intl.properties");
 EOF
 
 export MOZ_APP_DISPLAYNAME="Fx Browser"
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} -C objdir install DESTDIR=$RPM_BUILD_ROOT
 
 %{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
 
@@ -453,6 +444,16 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Apr 18 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 20.0.1-2
+- remove patch22
+
+* Mon Apr 15 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 20.0.1-1
+- update to 20.0.1
+- build with internal nss/nspr
+
+* Fri Mar 29 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 19.0.2-3
+- add BR: curl-devel
+
 * Sun Mar 24 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 19.0.2-2
 - add Patch16 to fix mozbz#239254 (fixed in upstream)