Update to 17 Beta 6

4 files changed, 157 insertions, 93 deletions

diff --git a/firefox-mozconfig b/firefox-mozconfig
index 8278b5e..54ef4df 100644
--- a/firefox-mozconfig
+++ b/firefox-mozconfig
@@ -32,6 +32,7 @@ ac_add_options --enable-url-classifier
 ac_add_options --enable-gio
 ac_add_options --disable-gnomevfs
 ac_add_options --enable-chrome-format=omni
+ac_add_options --with-system-libxul
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
diff --git a/firefox.1 b/firefox.1
index b581a68..2086325 100644
--- a/firefox.1
+++ b/firefox.1
@@ -1,79 +1,125 @@
-.TH "FIREFOX" "1" "October 2012" "http://www.mozilla.org" "User Commands"
-.SH "NAME"
-Firefox \- a Web browser for X11 from the Mozilla Foundation.
-.SH "SYNOPSIS"
+.TH FIREFOX 1 "August 07, 2001" firefox "Linux User's Manual"
+.SH NAME
+firefox \- a Web browser for X11 derived from the Mozilla browser
+
+.SH SYNOPSIS
 .B firefox
 [\fIOPTIONS\fR] [\fIURL\fR]
-.SH "OPTIONS"
-Summary of command\-line options:
-.PP 
-\fBX11 options\fR
-.TP 
-\fB\-\-display\fR=\fIDISPLAY\fR
-X display to use.
-.TP 
-\fB\-\-sync\fR
-Make X calls synchronous.
-.TP 
-\fB\-\-g\-fatal\-warnings\fR
-Make all warnings fatal.
-.PP 
-\fBFirefox options\fR
-.TP 
-\fB\-h\fR or \fB\-help\fR
-Print all command-line options.
-.TP 
-\fB\-v\fR or \fB\-version\fR
-Print Firefox version.
-.TP 
-\fB\-P\fR <profile>
-Start with <profile>.
-.TP 
-\fB\-migration\fR
-Start with migration wizard.
-.TP 
-\fB\-ProfileManager\fR
-Start with ProfileManager.
-.TP 
-\fB\-no\-remote\fR
-Do not accept or send remote commands; implies \fB\-new\-instance\fR.
-.TP 
-\fB\-new\-instance\fR
-Open new instance, not a new window in running instance.
-.TP 
-\fB\-UILocale\fR <locale>
-Start with <locale> resources as UI Locale.
-.TP 
-\fB\-safe\-mode\fR
-Disables extensions and themes for this session.
-.TP 
-\fB\-jsconsole\fR
-Open the Error console.
-.TP 
-\fB\-browser\fR
-Open a browser window.
-.TP 
-\fB\-new\-window\fR <url>
-Open <url> in a new window.
-.TP 
-\fB\-new\-tab\fR <url>
-Open <url> in a new tab.
-.TP 
-\fB\-preferences\fR
-Open Preferences dialog.
-.TP 
-\fB\-search\fR <term>
-Search <term> with your default search engine.
-.TP 
-\fB\-private\fR
-Enable private browsing mode.
-.TP 
-\fB\-private\-toggle\fR
-Toggle private browsing mode.
-.TP 
-\fB\-setDefaultBrowser\fR
-Set this app as the default browser.
-.SH "BUGS"
-For packaging related bug reports (including this man page): https://bugzilla.redhat.com/
 
-For application bug reports: https://bugzilla.mozilla.org/
+.B firefox-bin
+[\fIOPTIONS\fR] [\fIURL\fR]
+
+.SH DESCRIPTION
+\fBMozilla Firefox\fR is an open-source web browser, designed for
+standards compliance, performance and portability.
+
+.SH USAGE
+\fBfirefox\fR is a simple shell script that will set up the
+environment for the actual executable, \fBfirefox-bin\fR.
+
+.SH OPTIONS
+A summary of the options supported by \fBfirefox\fR is included below.
+
+.SS "GTK options"
+\fB\-\-gdk-debug=\fR\fIFLAGS\fR
+Gdk debugging flags to set
+.TP
+\fB\-\-gdk-no-debug=\fR\fIFLAGS\fR
+Gdk debugging flags to unset
+.TP
+\fB\-\-gtk-debug=\fR\fIFLAGS\fR
+Gtk+ debugging flags to set
+.TP
+\fB\-\-gtk-no-debug=\fR\fIFLAGS\fR
+Gtk+ debugging flags to unset
+.TP
+\fB\-\-gtk-module=\fR\fIMODULE\fR
+Load an additional Gtk module
+
+.SS "X11 options"
+.TP
+.BI \-\-display= DISPLAY
+X display to use
+.TP
+.B \--sync
+Make X calls synchronous
+.TP
+.B \-\-no-xshm
+Don't use X shared memory extension
+.TP
+.BI \-\-xim-preedit= STYLE
+.TP
+.BI \-\-xim-status= STYLE
+.TP
+.B \-\-g-fatal-warnings
+Make all warnings fatal
+
+.SS "Firefox options"
+.TP
+\fB\-height\fR \fIvalue\fR
+Set height of startup window to \fIvalue\fR.
+.TP
+.B \-h, \-help
+Show summary of options.
+.TP
+.B \-installer
+Start with 4.x migration window.
+.TP
+\fB\-width\fR \fIvalue\fR
+Set width of startup window to \fIvalue\fR.
+.TP
+.B \-v, \-version
+Print \fB/usr/bin/firefox-bin\fR version.
+.TP
+\fB\-CreateProfile\fR \fIprofile\fR
+Create \fIprofile\fR.
+.TP
+\fB\-P\fR \fIprofile\fR
+Start with \fIprofile\fR.
+.TP
+.B \-ProfileWizard
+Start with profile wizard.
+.TP
+.B \-ProfileManager
+Start with profile manager.
+.TP
+.B \-SelectProfile
+Start with profile selection dialog.
+.TP
+\fB\-lang\fR \fIlang-region\fR
+Start with \fIlang-region\fR resources.
+.TP
+\fB\-remote\fR \fIcommand\fR
+Execute \fIcommand\fR in an already running Firefox process.  For more info,
+see: \fIhttp://www.mozilla.org/unix/remote.html\fR
+.TP
+.B \-splash
+Enable splash screen.
+.TP
+.B \-jsconsole
+Start with Javascript Console
+.TP
+\fB\-chrome\fR \fIurl\fR
+Load the specified chrome.
+.TP
+
+.SH FILES
+\fI/usr/bin/firefox\fR - shell script wrapping
+\fBfirefox\fR
+.br
+\fI/usr/lib/mozilla/firefox-bin\fR - \fBfirefox\fR
+executable
+
+.SH VERSION
+1.0
+
+.SH BUGS
+To report a bug, please visit \fIhttp://bugzilla.mozilla.org/\fR
+
+.SH "SEE ALSO"
+.BR mozilla(1)
+
+.SH AUTHORS
+.TP
+.B The Mozilla Organization
+.I http://www.mozilla.org/about.html
diff --git a/firefox.spec b/firefox.spec
index b039e85..7a9cc3b 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -1,3 +1,6 @@
+# Use system nss/nspr?
+%define system_nss        1
+
 # Separated plugins are supported on x86(64) only
 %ifarch %{ix86} x86_64
 %define separated_plugins 1
@@ -8,26 +11,22 @@
 # Build as a debug package?
 %define debug_build       0
 
-%if 0%{?fedora}
 %define homepage http://start.fedoraproject.org/
-%else
-%define homepage file:///usr/share/doc/HTML/index.html
-%endif
 %define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 
-%global xulrunner_version      16.0.2
-%global xulrunner_version_max  16.1
-%global xulrunner_release      1
+%global xulrunner_version      17.0
+%global xulrunner_version_max  17.1
+%global xulrunner_release      0.1
 %global alpha_version          0
-%global beta_version           0
+%global beta_version           6
 %global rc_version             0
 
 %global mozappdir     %{_libdir}/%{name}
 %global langpackdir   %{mozappdir}/langpacks
 %global tarballdir    mozilla-release
 
-%define official_branding       1
+%define official_branding       0
 %define build_langpacks         1
 %define include_debuginfo       0
 
@@ -47,7 +46,7 @@
 %global tarballdir  mozilla-release
 %endif
 %if %{defined pre_version}
-%global xulrunner_verrel %{xulrunner_version}-%{xulrunner_release}%{pre_name}
+%global xulrunner_verrel %{xulrunner_version}-%{xulrunner_release}
 %global pre_tag .%{pre_version}
 %else
 %global xulrunner_verrel %{xulrunner_version}-%{xulrunner_release}
@@ -55,14 +54,14 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        16.0.2
-Release:        4%{?pre_tag}%{?dist}
+Version:        17.0
+Release:        0.1%{?pre_tag}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 Source0:        ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.bz2
 %if %{build_langpacks}
-Source1:        firefox-langpacks-%{version}%{?pre_version}-20121026.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20121115.tar.xz
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -72,7 +71,7 @@ Source20:       firefox.desktop
 Source21:       firefox.sh.in
 Source23:       firefox.1
 
-# Build patches
+#Build patches
 Patch0:         firefox-install-dir.patch
 
 # Fedora patches
@@ -165,6 +164,14 @@ echo "ac_add_options --disable-debug" >> .mozconfig
 echo "ac_add_options --enable-optimize" >> .mozconfig
 %endif
 
+%if %{?system_nss}
+echo "ac_add_options --with-system-nspr" >> .mozconfig
+echo "ac_add_options --with-system-nss" >> .mozconfig
+%else
+echo "ac_add_options --without-system-nspr" >> .mozconfig
+echo "ac_add_options --without-system-nss" >> .mozconfig
+%endif
+
 #---------------------------------------------------------------------
 
 %build
@@ -176,7 +183,7 @@ cd %{tarballdir}
 # Disable C++ exceptions since Mozilla code is not exception-safe
 #
 MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | \
-                     %{__sed} -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')
+                     %{__sed} -e 's/-Wall//')
 %if %{?debug_build}
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//')
 %endif
@@ -322,6 +329,9 @@ create_default_langpack "zh-TW" "zh"
 # Copy over the LICENSE
 %{__install} -p -c -m 644 LICENSE $RPM_BUILD_ROOT/%{mozappdir}
 
+# Remove tmp files
+find $RPM_BUILD_ROOT/%{mozappdir}/modules -name '.mkdir.done' -exec rm -rf {} \;
+
 # Enable crash reporter for Firefox application
 %if %{include_debuginfo}
 sed -i -e "s/\[Crash Reporter\]/[Crash Reporter]\nEnabled=1/" $RPM_BUILD_ROOT/%{mozappdir}/application.ini
@@ -388,6 +398,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/48x48/apps/firefox.png
 %{mozappdir}/xulrunner
 %{mozappdir}/webapprt-stub
+%{mozappdir}/modules/*
 %dir %{mozappdir}/webapprt
 %{mozappdir}/webapprt/omni.ja
 %{mozappdir}/webapprt/webapprt.ini
@@ -401,6 +412,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Nov 15 2012 Martin Stransky <stransky@redhat.com> - 17.0-0.1b6
+- Update to 17.0 Beta 6
+
 * Wed Nov  7 2012 Jan Horak <jhorak@redhat.com> - 16.0.2-4
 - Added duckduckgo.com search engine
 
@@ -416,6 +430,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Thu Oct 11 2012 Martin Stransky <stransky@redhat.com> - 16.0.1-1
 - Update to 16.0.1
 
+* Thu Oct 11 2012 Martin Stransky <stransky@redhat.com> - 16.0.1-1
+- Update to 16.0.1
+
 * Mon Oct  8 2012 Jan Horak <jhorak@redhat.com> - 16.0-1
 - Update to 16.0
 - Use /var/tmp instead of /tmp (rhbz#860814)
diff --git a/sources b/sources
index 38e4dbb..0b94e25 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-1b360968ab05b2a59757d33514897915  firefox-16.0.2.source.tar.bz2
-f88f540f6dd1cba2c87b91cddec30665  firefox-langpacks-16.0.2-20121026.tar.xz
+95ee4ffd2520e2419b5e093bd5b7f5a2  firefox-17.0b6.source.tar.bz2
+ff3657bc2c1b7cdb5e03092de807462f  firefox-langpacks-17.0b6-20121115.tar.xz