rpms/thunderbird/F-8 thunderbird.sh.in, 1.8, 1.9 thunderbird.spec, 1.111, 1.112 firefox-1.5-embedwindow-visibility.patch, 1.1, NONE
Martin Stransky (stransky)
fedora-extras-commits at redhat.com
Fri Mar 7 15:02:13 UTC 2008
Author: stransky
Update of /cvs/pkgs/rpms/thunderbird/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19186
Modified Files:
thunderbird.sh.in thunderbird.spec
Removed Files:
firefox-1.5-embedwindow-visibility.patch
Log Message:
updated starting script, fixes #436410
Index: thunderbird.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-8/thunderbird.sh.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- thunderbird.sh.in 26 Sep 2007 15:32:44 -0000 1.8
+++ thunderbird.sh.in 7 Mar 2008 15:01:38 -0000 1.9
@@ -4,19 +4,34 @@
# (based on the Mozilla RPM launch script)
#
-MOZ_LIB_DIR="/usr/lib"
-if [ -x "/usr/lib64/thunderbird-TBIRD_VERSION/thunderbird-bin" ]
-then
- MOZ_LIB_DIR="/usr/lib64"
+##
+## Variables
+##
+MOZ_ARCH=$(uname -m)
+case $MOZ_ARCH in
+ x86_64 | ia64 | s390 )
+ MOZ_LIB_DIR="/usr/lib64"
+ SECONDARY_LIB_DIR="/usr/lib"
+ ;;
+ * )
+ MOZ_LIB_DIR="/usr/lib"
+ SECONDARY_LIB_DIR="/usr/lib64"
+ ;;
+esac
+
+if [ ! -x $MOZ_LIB_DIR/thunderbird-TBIRD_VERSION/thunderbird ]; then
+ if [ ! -x $SECONDARY_LIB_DIR/thunderbird-TBIRD_VERSION/thunderbird ]; then
+ echo "Error: $MOZ_LIB_DIR/thunderbird-TBIRD_VERSION/thunderbird not found"
+ if [ -d $SECONDARY_LIB_DIR ]; then
+ echo " $SECONDARY_LIB_DIR/thunderbird-TBIRD_VERSION/thunderbird not found"
+ fi
+ exit 1
+ fi
+ MOZ_LIB_DIR="$SECONDARY_LIB_DIR"
fi
-MOZILLA_FIVE_HOME="$MOZ_LIB_DIR/thunderbird-TBIRD_VERSION"
-MRE_HOME="$MOZ_LIB_DIR/thunderbird-TBIRD_VERSION"
-export MOZILLA_FIVE_HOME MRE_HOME
-
-MOZ_PROGRAM=$MRE_HOME/thunderbird
-#MOZ_CLIENT_PROGRAM="$MRE_HOME/mozilla-xremote-client -a thunderbird"
-MOZ_CLIENT_PROGRAM="$MRE_HOME/thunderbird-bin -remote"
+MOZ_DIST_BIN="$MOZ_LIB_DIR/thunderbird-TBIRD_VERSION"
+MOZ_PROGRAM="$MOZ_DIST_BIN/thunderbird"
##
## Set MOZ_ENABLE_PANGO is no longer used because Pango is enabled by default
@@ -25,74 +40,4 @@
#MOZ_DISABLE_PANGO=1
#export MOZ_DISABLE_PANGO
-
-function check_running() {
- $MOZ_CLIENT_PROGRAM '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 rm_shit() {
- find $HOME/.thunderbird -name XUL.mfasl 2>/dev/null | xargs rm -f
-}
-
-# currently unused
-MOZARGS=""
-
-ALREADY_RUNNING=`check_running`
-
-# If no command-line arguments given...
-if [ -z "$1" ]; then
- if [ "${ALREADY_RUNNING}" -eq "1" ]; then
- exec $MOZ_CLIENT_PROGRAM "xfeDoCommand(openInbox)" >/dev/null 2>&1
- else
- rm_shit
- exec $MOZ_PROGRAM $MOZARGS >/dev/null 2>&1
- fi
-fi
-
-for arg in $@ ; do
- case "$1" in
- -remote)
- shift
- exec $MOZ_PROGRAM -remote "$@"
- ;;
-
- -mail)
- shift
- if [ "${ALREADY_RUNNING}" -eq "1" ]; then
- # remove 'mailto:' prefix
- ARGS="`echo $@ | sed 's/^mailto://'`"
- exec $MOZ_CLIENT_PROGRAM "mailto($ARGS)"
- else
- rm_shit
- exec $MOZ_PROGRAM $MOZARGS -mail "$@"
- fi
- ;;
-
- -compose)
- shift
- if [ "${ALREADY_RUNNING}" -eq "1" ]; then
- # remove 'mailto:' prefix
- ARGS="`echo $@ | sed 's/^mailto://'`"
- exec $MOZ_CLIENT_PROGRAM "mailto($ARGS)"
- else
- rm_shit
- exec $MOZ_PROGRAM $MOZARGS -compose "$@"
- fi
- ;;
-
- *)
- # for now, pass it on and hope for the best
- exec $MOZ_PROGRAM $MOZARGS "$@"
- ;;
- esac
- shift
-done
-
+exec $MOZ_PROGRAM "$@"
Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/F-8/thunderbird.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- thunderbird.spec 26 Feb 2008 23:26:09 -0000 1.111
+++ thunderbird.spec 7 Mar 2008 15:01:38 -0000 1.112
@@ -309,6 +309,9 @@
#===============================================================================
%changelog
+* Fri Mar 07 2008 Martin Stransky <stransky at redhat.com>
+- updated starting script, fixes #436410
+
* Tue Feb 26 2008 Christopher Aillon <caillon at redhat.com> 2.0.0.12-1
- Update to 2.0.0.12
--- firefox-1.5-embedwindow-visibility.patch DELETED ---
More information about the fedora-extras-commits
mailing list