rename from xulrunner16 to xulrunner-last, sync with rawhide

3 files changed, 99 insertions, 137 deletions

diff --git a/firefox-install-dir.patch b/firefox-install-dir.patch
index 1c0d8d3..e788fa0 100644
--- a/firefox-install-dir.patch
+++ b/firefox-install-dir.patch
@@ -1,6 +1,6 @@
-diff -up firefox-16.0/mozilla-release/config/baseconfig.mk.old firefox-16.0/mozilla-release/config/baseconfig.mk
---- firefox-16.0/mozilla-release/config/baseconfig.mk.old	2012-10-08 20:38:31.119228352 +0200
-+++ firefox-16.0/mozilla-release/config/baseconfig.mk	2012-10-08 20:38:57.618309057 +0200
+diff -up mozilla-aurora-7676a9a06403/config/baseconfig.mk.dir mozilla-aurora-7676a9a06403/config/baseconfig.mk
+--- mozilla-aurora-7676a9a06403/config/baseconfig.mk.dir	2012-09-13 14:18:35.000000000 +0200
++++ mozilla-aurora-7676a9a06403/config/baseconfig.mk	2012-09-26 10:13:45.258240426 +0200
 @@ -2,7 +2,7 @@ INCLUDED_AUTOCONF_MK = 1
  
  includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
@@ -10,9 +10,9 @@ diff -up firefox-16.0/mozilla-release/config/baseconfig.mk.old firefox-16.0/mozi
  sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
  DIST = $(DEPTH)/dist
  
-diff -up firefox-16.0/mozilla-release/js/src/config/baseconfig.mk.old firefox-16.0/mozilla-release/js/src/config/baseconfig.mk
---- firefox-16.0/mozilla-release/js/src/config/baseconfig.mk.old	2012-10-08 20:38:37.756248430 +0200
-+++ firefox-16.0/mozilla-release/js/src/config/baseconfig.mk	2012-10-08 20:39:15.974365249 +0200
+diff -up mozilla-aurora-7676a9a06403/js/src/config/baseconfig.mk.dir mozilla-aurora-7676a9a06403/js/src/config/baseconfig.mk
+--- mozilla-aurora-7676a9a06403/js/src/config/baseconfig.mk.dir	2012-09-13 14:18:35.000000000 +0200
++++ mozilla-aurora-7676a9a06403/js/src/config/baseconfig.mk	2012-09-26 10:14:07.353351833 +0200
 @@ -1,6 +1,6 @@
  INCLUDED_AUTOCONF_MK = 1
  
diff --git a/firefox.1 b/firefox.1
index 2086325..b581a68 100644
--- a/firefox.1
+++ b/firefox.1
@@ -1,125 +1,79 @@
-.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
+.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"
 .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/
 
-.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
+For application bug reports: https://bugzilla.mozilla.org/
diff --git a/firefox.spec b/firefox.spec
index 0100b33..fa3ecd4 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -26,10 +26,8 @@
 %define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 
-#global shortname              firefox
-#global mycomment              Beta 4
-%global firefox_dir_ver        16
 %global xulrunner_version      16.0.2
+%global xulrunner_version_max  16.1
 %global xulrunner_release      1
 %global alpha_version          0
 %global beta_version           0
@@ -69,7 +67,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        16.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -108,14 +106,15 @@ Patch15:        firefox-15.0-enable-addons.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  system-bookmarks
-BuildRequires:  xulrunner%{firefox_dir_ver}-devel >= %{xulrunner_verrel}
+BuildRequires:  xulrunner-last-devel >= %{xulrunner_verrel}
 # For WebM support
 BuildRequires:	yasm
 
-Requires:       xulrunner%{firefox_dir_ver}%{?_isa} >= %{xulrunner_verrel}
+Requires:       xulrunner-last%{?_isa} >= %{xulrunner_verrel}
 Requires:       system-bookmarks
 Obsoletes:      mozilla <= 37:1.7.13
 Provides:       webclient
+Conflicts:      xulrunner-last%{?_isa} >= %{xulrunner_version_max}
 
 
 %description
@@ -135,7 +134,7 @@ cd %{tarballdir}
 # Build patches, can't change backup suffix from default because during build
 # there is a compare of config and js/config directories and .orig suffix is 
 # ignored during this compare.
-%patch0 -p2 -b .orig
+%patch0 -p1
 
 # For branding specific patches.
 
@@ -443,7 +442,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{mozappdir}/searchplugins
 %{mozappdir}/run-mozilla.sh
 %{mozappdir}/application.ini
-%{mozappdir}/webapprt*
 %exclude %{mozappdir}/removed-files
 %{_datadir}/icons/hicolor/16x16/apps/firefox.png
 %{_datadir}/icons/hicolor/22x22/apps/firefox.png
@@ -452,7 +450,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/32x32/apps/firefox.png
 %{_datadir}/icons/hicolor/48x48/apps/firefox.png
 %{mozappdir}/xulrunner
-
+%{mozappdir}/webapprt-stub
+%dir %{mozappdir}/webapprt
+%{mozappdir}/webapprt/omni.ja
+%{mozappdir}/webapprt/webapprt.ini
 %if %{include_debuginfo}
 #%{mozappdir}/crashreporter
 %{mozappdir}/crashreporter-override.ini
@@ -463,6 +464,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Nov  1 2012 Remi Collet <RPMS@FamilleCollet.com> - 16.0.2-2
+- Sync with rawhide
+- build using xulrunner-last
+
+* Tue Oct 30 2012 Martin Stransky <stransky@redhat.com> - 16.0.2-2
+- Updated man page (#800234)
+
 * Fri Oct 26 2012 Remi Collet <RPMS@FamilleCollet.com> - 16.0.2-1
 - Sync with rawhide, update to 16.0.2