OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Jun-2005 19:23:36
Branch: HEAD Handle: 2005062518233600
Modified files:
openpkg-src/firefox firefox.sh firefox.spec
Log:
fix remote command handling and description
Summary:
Revision Changes Path
1.5 +12 -11 openpkg-src/firefox/firefox.sh
1.24 +4 -4 openpkg-src/firefox/firefox.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/firefox/firefox.sh
============================================================================
$ cvs diff -u -r1.4 -r1.5 firefox.sh
--- openpkg-src/firefox/firefox.sh 11 Jun 2005 22:05:39 -0000 1.4
+++ openpkg-src/firefox/firefox.sh 25 Jun 2005 17:23:36 -0000 1.5
@@ -25,7 +25,8 @@
# configuration
firefox_dir="@l_prefix@/lib/firefox"
-firefox_bin="@l_prefix@/lib/firefox/firefox"
+firefox_browser_bin="$firefox_dir/firefox"
+firefox_remote_bin="$firefox_dir/run-mozilla.sh
$firefox_dir/mozilla-xremote-client"
xsel_bin="@l_prefix@/bin/xsel"
# option parsing
@@ -61,12 +62,12 @@
# special case of direct remote option
if [ ".$opt_r" != . ]; then
- verbose "exec: $firefox_bin -remote \"$opt_r\""
- exec $firefox_bin -remote "$opt_r"
+ verbose "exec: $firefox_remote_bin \"$opt_r\""
+ exec $firefox_remote_bin "$opt_r"
fi
# determine Mozilla run-time status
-$firefox_bin -remote "ping()" >/dev/null 2>&1
+$firefox_remote_bin "ping()" >/dev/null 2>&1
if [ $? -eq 0 ]; then
verbose "process already running (available remotely)"
restart=no
@@ -152,11 +153,11 @@
# handling of first URL if restarting is necessary
verbose "running new process"
if [ ".$url" = ".about:blank" ]; then
- verbose "exec: $firefox_bin >/dev/null 2>&1 &"
- $firefox_bin >/dev/null 2>&1 &
+ verbose "exec: $firefox_browser_bin >/dev/null 2>&1 &"
+ $firefox_browser_bin >/dev/null 2>&1 &
else
- verbose "exec: $firefox_bin \"$url\" >/dev/null 2>&1 &"
- $firefox_bin "$url" >/dev/null 2>&1 &
+ verbose "exec: $firefox_browser_bin \"$url\" >/dev/null 2>&1 &"
+ $firefox_browser_bin "$url" >/dev/null 2>&1 &
fi
else
# delayed waiting for process to be finally remotely available
@@ -168,7 +169,7 @@
sleep 4 # give it a little bit of time to fully startup
i=0
while [ $i -lt 10 ]; do
- $firefox_bin -remote "ping()" >/dev/null 2>&1
+ $firefox_remote_bin "ping()" >/dev/null 2>&1
if [ $? -eq 0 ]; then
break
fi
@@ -192,8 +193,8 @@
# perform remote command
verbose "sending remote command to running process"
- verbose "exec: $firefox_bin -remote \"$cmd\" >/dev/null 2>&1"
- $firefox_bin -remote "$cmd" >/dev/null 2>&1
+ verbose "exec: $firefox_remote_bin \"$cmd\" >/dev/null 2>&1"
+ $firefox_remote_bin "$cmd" >/dev/null 2>&1
fi
first=no
done
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/firefox/firefox.spec
============================================================================
$ cvs diff -u -r1.23 -r1.24 firefox.spec
--- openpkg-src/firefox/firefox.spec 15 Jun 2005 15:10:33 -0000 1.23
+++ openpkg-src/firefox/firefox.spec 25 Jun 2005 17:23:36 -0000 1.24
@@ -33,7 +33,7 @@
Group: Web
License: MPL
Version: 1.0.4
-Release: 20050615
+Release: 20050625
# package options
%option with_optimize yes
@@ -65,9 +65,9 @@
AutoReqProv: no
%description
- Firefox is a speedy, full featured Web browser based on the Mozilla
- codebase. It uses the Mozilla Gecko engine for rendering the Mozilla
- Web content and XUL for presenting the GUI.
+ Firefox is a speedy, full featured and extensible Web browser based
+ on the Mozilla Suite codebase. It uses the Mozilla Gecko engine for
+ rendering the Web content and XUL for presenting the GUI.
%track
prog firefox = {
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
