Author: glen Date: Mon Jan 29 23:18:54 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- merged Revision 1.41 2006/09/10 11:59:45 sparky:
- start script uses exec now, and simplified a little
---- Files affected:
SPECS:
seamonkey.spec (1.32.2.18 -> 1.32.2.19)
---- Diffs:
================================================================
Index: SPECS/seamonkey.spec
diff -u SPECS/seamonkey.spec:1.32.2.18 SPECS/seamonkey.spec:1.32.2.19
--- SPECS/seamonkey.spec:1.32.2.18 Sat Jan 27 14:27:48 2007
+++ SPECS/seamonkey.spec Tue Jan 30 00:18:48 2007
@@ -319,44 +319,45 @@
LD_LIBRARY_PATH=%{_seamonkeydir}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH
-MOZILLA_FIVE_HOME=%{_seamonkeydir}
+MOZILLA_FIVE_HOME="%{_seamonkeydir}"
+SEAMONKEY="$MOZILLA_FIVE_HOME/seamonkey-bin"
if [ "$1" == "-remote" ]; then
- %{_seamonkeydir}/seamonkey-bin "$@"
-else
- PING=`%{_seamonkeydir}/seamonkey-bin -remote 'ping()' 2>&1 >/dev/null`
+ exec $SEAMONKEY "$@"
+fi
+
+PING=`$SEAMONKEY -remote 'ping()' 2>&1 >/dev/null`
if [ -n "$PING" ]; then
if [ -f "`pwd`/$1" ]; then
- %{_seamonkeydir}/seamonkey-bin "file://`pwd`/$1"
+ exec $SEAMONKEY "file://`pwd`/$1"
else
- %{_seamonkeydir}/seamonkey-bin "$@"
+ exec $SEAMONKEY "$@"
fi
- else
+fi
+
if [ -z "$1" ]; then
- %{_seamonkeydir}/seamonkey-bin -remote 'xfeDoCommand
(openBrowser)'
+ exec $SEAMONKEY -remote 'xfeDoCommand (openBrowser)'
elif [ "$1" == "-mail" ]; then
- %{_seamonkeydir}/seamonkey-bin -remote 'xfeDoCommand
(openInbox)'
+ exec $SEAMONKEY -remote 'xfeDoCommand (openInbox)'
elif [ "$1" == "-compose" ]; then
- %{_seamonkeydir}/seamonkey-bin -remote 'xfeDoCommand
(composeMessage)'
- else
- echo $1 | grep -q "^-" > /dev/null
- if [ $? -eq 0 ]; then
- %{_seamonkeydir}/seamonkey-bin "$@"
- else
+ exec $SEAMONKEY -remote 'xfeDoCommand (composeMessage)'
+fi
+
+[[ $1 == -* ]] && exec $SEAMONKEY "$@"
+
if [ -f "`pwd`/$1" ]; then
URL="file://`pwd`/$1"
else
URL="$1"
fi
- grep browser.tabs.opentabfor.middleclick
~/.mozilla/default/*/prefs.js | grep true > /dev/null
- if [ $? -eq 0 ]; then
- %{_seamonkeydir}/seamonkey-bin -remote
"OpenUrl($URL,new-tab)"
+if grep -q -E 'browser.tabs.opentabfor.middleclick.*true' \
+ ~/.mozilla/default/*/prefs.js; then
+ exec $SEAMONKEY -remote "OpenUrl($URL,new-tab)"
else
- %{_seamonkeydir}/seamonkey-bin -remote
"OpenUrl($URL,new-window)"
- fi
- fi
- fi
- fi
+ exec $SEAMONKEY -remote "OpenUrl($URL,new-window)"
fi
+
+echo "Cannot execute SeaMonkey ($SEAMONKEY)!" >&2
+exit 1
EOF
cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
@@ -739,6 +740,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.32.2.19 2007/01/29 23:18:48 glen
+- merged Revision 1.41 2006/09/10 11:59:45 sparky:
+ - start script uses exec now, and simplified a little
+
Revision 1.32.2.18 2007/01/27 13:27:48 sparky
- seems to be stable - removed bogus desc in es and pt_BR
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/seamonkey.spec?r1=1.32.2.18&r2=1.32.2.19&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
