Update patches, images and spec file to the current tip. Not part of the build.

build/package/rpm/SOURCES/mozilla-navigator-overlay-menu.patch

@@ -1,6 +1,6 @@
---- mozilla/xpfe/browser/resources/content/navigatorOverlay.xul.debug	Tue Aug 14 10:21:49 2001
-+++ mozilla/xpfe/browser/resources/content/navigatorOverlay.xul	Tue Aug 14 10:23:00 2001
-@@ -338,119 +338,7 @@
+--- mozilla/xpfe/browser/resources/content/navigatorOverlay.xul.debug	Sat Sep  8 11:36:22 2001
++++ mozilla/xpfe/browser/resources/content/navigatorOverlay.xul	Sat Sep  8 11:37:14 2001
+@@ -338,120 +338,7 @@
    <menu id="tasksMenu"/>
    
    <menu accesskey="&helpMenuCmd.accesskey;" id="menu_Help"/>
@@ -73,9 +73,10 @@
 -
 -      <menu label="XUL Test Suite">
 -       <menupopup>
--         <menuitem label="#1 Popups" oncommand="window._content.location.href='http://www.mozilla.org/projects/xul/tests/popups.xul'"/>
--         <menuitem label="#2 Descriptions and Labels" oncommand="window._content.location.href='http://www.mozilla.org/projects/xul/tests/label.xul'"/>
--         <menuitem label="#3 Dialog Buttons" oncommand="window._content.location.href='http://www.mozilla.org/projects/xul/tests/buttons.xul'"/>
+-         <menuitem label="#1 Stacks" oncommand="window._content.location.href='http://www.mozilla.org/projects/xul/tests/stacks.xul'"/>
+-         <menuitem label="#2 Popups" oncommand="window._content.location.href='http://www.mozilla.org/projects/xul/tests/popups.xul'"/>
+-         <menuitem label="#3 Descriptions and Labels" oncommand="window._content.location.href='http://www.mozilla.org/projects/xul/tests/label.xul'"/>
+-         <menuitem label="#4 Dialog Buttons" oncommand="window._content.location.href='http://www.mozilla.org/projects/xul/tests/buttons.xul'"/>
 -        </menupopup>
 -      </menu>
 -

build/package/rpm/SOURCES/mozilla-redhat-home-page-6.2.patch

@@ -1,18 +0,0 @@
---- mozilla/xpfe/browser/resources/locale/en-US/region.properties.home-page	Mon Feb 26 11:01:33 2001
-+++ mozilla/xpfe/browser/resources/locale/en-US/region.properties	Mon Feb 26 11:02:09 2001
-@@ -1,5 +1,5 @@
- # navigator.properties
--homePageDefault=http://www.mozilla.org/
-+homePageDefault=file:///usr/doc/HTML/index.html
- shopKeyword=keyword:shop [Product]
- quoteKeyword=keyword:quote [Enter symbol here]
- localKeyword=keyword:zip [Your zip code]
-@@ -11,7 +11,7 @@
- #
- # all.js
- #
--browser.startup.homepage=http://www.mozilla.org/
-+browser.startup.homepage=file:///usr/doc/HTML/index.html
- browser.throbber.url=http://www.mozilla.org/
- 
- wallet.Server=http://www.mozilla.org/wallet/tables/

build/package/rpm/SOURCES/mozilla-redhat-home-page.patch

@@ -1,5 +1,5 @@
---- mozilla/xpfe/browser/resources/locale/en-US/region.properties.home-page	Mon Feb 26 11:01:33 2001
-+++ mozilla/xpfe/browser/resources/locale/en-US/region.properties	Mon Feb 26 11:02:09 2001
+--- mozilla/xpfe/browser/resources/locale/en-US/region.properties.home-page	Fri Sep  7 12:43:36 2001
++++ mozilla/xpfe/browser/resources/locale/en-US/region.properties	Fri Sep  7 12:44:24 2001
 @@ -1,5 +1,5 @@
  # navigator.properties
 -homePageDefault=http://www.mozilla.org/
@@ -11,8 +11,14 @@
  #
  # all.js
  #
--browser.startup.homepage=http://www.mozilla.org/
+-browser.startup.homepage=http://www.mozilla.org/start
 +browser.startup.homepage=file:///usr/share/doc/HTML/index.html
  browser.throbber.url=http://www.mozilla.org/
+ browser.search.defaulturl=http://search.netscape.com/cgi-bin/search?search=
  
- wallet.Server=http://www.mozilla.org/wallet/tables/
+@@ -20,4 +20,4 @@
+ 
+ #config.js
+ #
+-startup.homepage_override_url=http://www.mozilla.org/start
++startup.homepage_override_url=file:///usr/share/doc/HTML/index.html

build/package/rpm/SOURCES/mozilla.sh

@@ -31,29 +31,6 @@
 ## The script will setup all the environment voodoo needed to make
 ## mozilla work.
 
-##
-## Standard shell script disclaimer blurb thing:
-##
-## This script is a hcak.  Its brute force.  Its horrible.  
-## It doesnt use Artificial Intelligence.  It doesnt use Virtual Reality.
-## Its not perl.  Its not python.  It probably wont work unchanged on
-## the "other" thousands of unices.  But it worksforme.
-##
-## If you have an improvement, patch, idea, whatever, on how to make this
-## script better, post it here:
-##
-## news://news.mozilla.org/netscape.public.mozilla.patches
-## news://news.mozilla.org/netscape.public.mozilla.unix
-##
-## 
-
-##
-## Potential improvements:
-##
-## + Run ldd on the program and report missing dlls
-## + All the "other" unices/packages
-##
-
 cmdname=`basename $0`
 
 ## don't leave any core files around
@@ -86,7 +63,7 @@ export LD_LIBRARY_PATH
 
 # Figure out if we need to ser LD_ASSUME_KERNEL for older versions of the JVM.
 
-set_jvm_vars() {
+function set_jvm_vars() {
 
     if [ ! -L /usr/lib/mozilla/plugins/libjavaplugin_oji.so ]; then
 	return;
@@ -139,23 +116,54 @@ set_jvm_vars() {
     esac
 }
 
+function check_running() {
+    $MOZ_PROGRAM -remote 'ping()' 2>/dev/null >/dev/null
+    RETURN_VAL=$?
+    if [ "$RETURN_VAL" -eq "2" ]; then
+      echo 0
+      return 0
+    else
+      echo 1
+      return 1
+    fi
+}
+
+function open_mail() {
+    if [ "${ALREADY_RUNNING}" -eq "1" ]; then
+      exec $MOZ_PROGRAM -remote 'xfeDoCommand(openInbox)' \
+        2>/dev/null >/dev/null
+    else
+      exec $MOZ_PROGRAM $*
+    fi
+}
+
+function open_compose() {
+    if [ "${ALREADY_RUNNING}" -eq "1" ]; then
+      exec $MOZ_PROGRAM -remote 'xfeDoCommand(composeMessage)' \
+        2>/dev/null >/dev/null
+    else
+      exec $MOZ_PROGRAM $*
+    fi
+}
+
+# OK, here's where all the real work gets done
+
+# set our JVM vars
 set_jvm_vars
 
+# check to see if there's an already running instance or not
+ALREADY_RUNNING=`check_running`
+
 # If there is no command line argument at all then try to open a new
 # window in an already running instance.
+if [ "${ALREADY_RUNNING}" == "1" ] && [ -z "$1" ]; then
+  exec $MOZ_PROGRAM -remote "xfeDoCommand(openBrowser)" 2>/dev/null >/dev/null
+fi
 
+# if there's no command line argument and there's not a running
+# instance then just fire up a new copy of the browser
 if [ -z "$1" ]; then
-  $MOZ_PROGRAM -remote "openurl(about:blank,new-window)" 2>/dev/null >/dev/null
-  # no window found?
-  RETURN_VAL=$?
-  if [ "$RETURN_VAL" -eq "2" ]; then
-    exec $MOZ_PROGRAM ${1+"$@"}
-  fi
-  if [ "$RETURN_VAL" -eq "0" ]; then
-    exit 0;
-  fi
-  echo "Error sending command."
-  exit $RETURN_VAL
+  exec $MOZ_PROGRAM 2>/dev/null >/dev/null
 fi
 
 unset RETURN_VAL
@@ -166,37 +174,31 @@ unset RETURN_VAL
 USE_EXIST=0
 opt="$1"
 case "$opt" in
+  -mail)
+      open_mail ${1+"$@"}
+      ;;
+  -compose)
+      open_compose ${1+"$@"}
+      ;;
   -*) ;;
   *) USE_EXIST=1 ;;
 esac
 
-if [ "$USE_EXIST" -eq "1" ]; then
+if [ "${USE_EXIST}" -eq "1" ] && [ "${ALREADY_RUNNING}" -eq "1" ]; then
   # check to make sure that the command contains at least a :/ in it.
   echo $opt | grep -e ':/' 2>/dev/null > /dev/null
   RETURN_VAL=$?
   if [ "$RETURN_VAL" -eq "1" ]; then
-    # does it begin with a / ?
+    # if it doesn't begin with a '/' and it exists when the pwd is
+    # prepended to it then append the full path
     echo $opt | grep -e '^/' 2>/dev/null > /dev/null
-    RETURN_VAL=$?
-    if [ "$RETURN_VAL" -eq "0" ]; then
-      opt="file:$opt"
-    elif [ -e `pwd`/$opt ]; then
-      opt="file://`pwd`/$opt"
-    else
-      opt="http://$opt"
+    if [ "${RETURN_VAL}" -ne "0" ] && [ -e `pwd`/$opt ]; then
+      opt="`pwd`/$opt"
     fi
+    exec $MOZ_PROGRAM -remote "openurl($opt)" 2>/dev/null >/dev/null
   fi
-  # ok, send it
-  $MOZ_PROGRAM -remote "openurl($opt)" 2>/dev/null > /dev/null
-  RETURN_VAL=$?
-  if [ "$RETURN_VAL" -eq "2" ]; then
-    exec $MOZ_PROGRAM ${1+"$@"}
-  fi
-  if [ "$RETURN_VAL" -eq "0" ]; then
-    exit 0;
-  fi
-  echo "Error sending command."
-  exit $RETURN_VAL
+  # just pass it off if it looks like a url
+  exec $MOZ_PROGRAM -remote "openurl($opt,new-window)" 2>/dev/null >/dev/null
 fi
 
 exec $MOZ_PROGRAM ${1+"$@"}

build/package/rpm/SPECS/mozilla-DATE.spec.in

@@ -7,15 +7,16 @@ Copyright:   MPL
 Source0:     mozilla-source-DATE.tar.gz
 Source1:     mozilla.sh
 Source2:     mozilla-icon.png
-Source3:     migrate-icon.gif
 Source4:     mozilla.desktop
-Source5:     mozilla-profile.desktop
-Source6:     mozilla-ns-upgrade.desktop
 Source7:     mozilla-make-package.pl
 Source8:     mozilla-copy-package-files.sh
 Source9:     mozicon16.xpm
 Source10:    mozicon50.xpm
 Source11:    rebuild-databases.sh
+Source12:    mozilla-mail.desktop
+Source13:    mozilla-mail-icon.gif
+Source14:    mozilla-compose.desktop
+Source15:    mozilla-compose-icon.gif
 Patch0:      mozilla-navigator-overlay-menu.patch
 Patch1:      mozilla-editor-overlay-menu.patch
 Patch6:      mozilla-prefs-debug.patch
@@ -287,11 +288,11 @@ install -c -m 755 %{SOURCE11} $RPM_BUILD_ROOT/%{prefix}/lib/mozilla/
 /bin/mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/pixmaps/
 /bin/mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Internet
 
-/bin/cp %{SOURCE2} $RPM_BUILD_ROOT/%{prefix}/share/pixmaps/
-/bin/cp %{SOURCE3} $RPM_BUILD_ROOT/%{prefix}/share/pixmaps/
-/bin/cp %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/applnk/Internet
-/bin/cp %{SOURCE5} $RPM_BUILD_ROOT/etc/X11/applnk/Internet
-/bin/cp %{SOURCE6} $RPM_BUILD_ROOT/etc/X11/applnk/Internet
+/bin/cp %{SOURCE2} %{SOURCE13} %{SOURCE15} \
+  $RPM_BUILD_ROOT/%{prefix}/share/pixmaps/
+
+/bin/cp %{SOURCE4} %{SOURCE12} %{SOURCE14} \
+  $RPM_BUILD_ROOT/etc/X11/applnk/Internet
 
 # our icons are better!
 /bin/cp %{SOURCE9}  $RPM_BUILD_ROOT/usr/lib/mozilla/icons/
@@ -368,7 +369,8 @@ fi
 %{prefix}/bin/mozilla
 %{prefix}/lib/mozilla/rebuild-databases.sh
 %{prefix}/share/pixmaps/mozilla-icon.png
-%{prefix}/share/pixmaps/migrate-icon.gif
+%{prefix}/share/pixmaps/mozilla-mail-icon.gif
+%{prefix}/share/pixmaps/mozilla-compose-icon.gif
 
 %verify (not md5 mtime size) %{prefix}/lib/mozilla/component.reg
 %verify (not md5 mtime size) %{prefix}/lib/mozilla/components/xptitemp.dat
@@ -393,11 +395,11 @@ fi
 %dir %{prefix}/lib/mozilla/res/entityTables
 
 /etc/X11/applnk/Internet/mozilla.desktop
-/etc/X11/applnk/Internet/mozilla-profile.desktop
-/etc/X11/applnk/Internet/mozilla-ns-upgrade.desktop
 
 %files mail -f /tmp/mozilla-mail.package
 %defattr(-,root,root)
+/etc/X11/applnk/Internet/mozilla-mail.desktop
+/etc/X11/applnk/Internet/mozilla-compose.desktop
 
 %files psm -f /tmp/mozilla-psm.package
 %defattr(-,root,root)
@@ -416,6 +418,10 @@ fi
 
 
 %changelog
+* Sun Sep 16 2001 Christopher Blizzard <blizzard@redhat.com>
+- Add mail and compose .desktop entries.
+- Fix launcher script to handle all of the much improved xremote code.
+
 * Sun Aug 05 2001 Christopher Blizzard <blizzard@redhat.com>
 - Remove alpha compiler patch.