From cac10961d449ba7777aac24d8dc2bcb4a11e5e38 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Jan 28 2008 14:10:56 +0000 Subject: - cleared starting scripts, removed useless parts --- diff --git a/firefox-xremote-client.sh.in b/firefox-xremote-client.sh.in deleted file mode 100644 index d6152c6..0000000 --- a/firefox-xremote-client.sh.in +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -## -## Set MOZILLA_FIVE_HOME -## -MOZILLA_FIVE_HOME="FFDIR" - -export MOZILLA_FIVE_HOME - -## -## Select the propper plugin dir -## Wrapped plug-ins are located in /lib/mozilla/plugins-wrapped -## -if [ -x "/usr/bin/mozilla-plugin-config" ] -then - MOZ_PLUGIN_DIR="plugins-wrapped" -else - MOZ_PLUGIN_DIR="plugins" -fi - -## -## Set LD_LIBRARY_PATH -## -if [ "$LD_LIBRARY_PATH" ] -then - LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$MOZILLA_FIVE_HOME/$MOZ_PLUGIN_DIR:LIBDIR/mozilla/$MOZ_PLUGIN_DIR:LIBDIR:$LD_LIBRARY_PATH -else - LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$MOZILLA_FIVE_HOME/$MOZ_PLUGIN_DIR:LIBDIR/mozilla/$MOZ_PLUGIN_DIR:LIBDIR -fi - export LD_LIBRARY_PATH - -$MOZILLA_FIVE_HOME/firefox -remote "$1" diff --git a/firefox.sh.in b/firefox.sh.in index 17c4562..d0067a6 100644 --- a/firefox.sh.in +++ b/firefox.sh.in @@ -61,8 +61,6 @@ fi MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION" MOZ_EXTENSIONS_DIR="$MOZ_DIST_BIN/extensions" MOZ_PROGRAM="$MOZ_DIST_BIN/firefox" -MOZ_CLIENT_PROGRAM="$MOZ_DIST_BIN/firefox-xremote-client" -MOZ_CLIENT_PROGRAM_PARAM="-a firefox" ## ## Set MOZ_GRE_CONF @@ -103,6 +101,14 @@ fi export MOZ_PLUGIN_PATH ## +## If plugins are wrapped, check them +## +if [ -x "/usr/bin/mozilla-plugin-config" ] +then + /usr/bin/mozilla-plugin-config +fi + +## ## Set FONTCONFIG_PATH for Xft/fontconfig ## FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft" @@ -121,54 +127,7 @@ export FONTCONFIG_PATH # export MOZ_DISABLE_PANGO # -function check_running() { - $MOZ_CLIENT_PROGRAM $MOZ_CLIENT_PROGRAM_PARAM '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_CLIENT_PROGRAM $MOZ_CLIENT_PROGRAM_PARAM 'xfeDoCommand(openInbox)' \ - 2>/dev/null >/dev/null - else - exec $MOZ_PROGRAM $* - fi -} - -function open_compose() { - if [ "${ALREADY_RUNNING}" -eq "1" ]; then - exec $MOZ_CLIENT_PROGRAM $MOZ_CLIENT_PROGRAM_PARAM 'xfeDoCommand(composeMessage)' \ - 2>/dev/null >/dev/null - else - exec $MOZ_PROGRAM $* - fi -} - # OK, here's where all the real work gets done -## -## If plugins are wrapped, check them -## -if [ -x "/usr/bin/mozilla-plugin-config" ] -then - /usr/bin/mozilla-plugin-config -fi - -# check to see if there's an already running instance or not -#ALREADY_RUNNING=`check_running` -ALREADY_RUNNING="0" - -# If there is no command line argument at all then try to open a new -# window in an already running instance. -if [ "${ALREADY_RUNNING}" -eq "1" ] && [ -z "$1" ]; then - exec $MOZ_CLIENT_PROGRAM $MOZ_CLIENT_PROGRAM_PARAM "xfeDoCommand(openBrowser)" 2>/dev/null>/dev/null -fi # check system locale MOZARGS= @@ -180,47 +139,5 @@ SHORTMOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*||g"` MOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*|-\1|g"` [ -f $MOZ_EXTENSIONS_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/chrome/$MOZLOCALE.jar ] && MOZARGS="-UILocale $MOZLOCALE" - -# 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 - exec $MOZ_PROGRAM $MOZARGS 2>/dev/null >/dev/null -fi - -unset RETURN_VAL - -# If there's a command line argument but it doesn't begin with a - -# it's probably a url. Try to send it to a running instance. - -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" ] && [ "${ALREADY_RUNNING}" -eq "1" ]; then - opt=`echo -n "$opt" | sed -e 's/,/%2c/g' -e 's/ /%20/g'` - # 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 - # 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 - if [ "${RETURN_VAL}" -ne "0" ] && [ -e "`pwd`/$opt" ]; then - opt="`pwd`/$opt" - fi - exec $MOZ_CLIENT_PROGRAM $MOZ_CLIENT_PROGRAM_PARAM "openurl($opt)" 2>/dev/null >/dev/null - fi - # just pass it off if it looks like a url - exec $MOZ_CLIENT_PROGRAM $MOZ_CLIENT_PROGRAM_PARAM "openurl($opt)" 2>/dev/null >/dev/null -fi - +# Run the browser exec $MOZ_PROGRAM $MOZARGS ${1+"$@"} diff --git a/firefox.spec b/firefox.spec index 3ce75cd..b5bd885 100644 --- a/firefox.spec +++ b/firefox.spec @@ -15,7 +15,7 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 3.0 -Release: 0.beta2.12.nightly20080121%{?dist} +Release: 0.beta2.13.nightly20080121%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -33,7 +33,6 @@ Source20: firefox.desktop Source21: firefox.sh.in Source22: firefox.png Source23: firefox.1 -Source50: firefox-xremote-client.sh.in Source100: find-external-requires @@ -181,10 +180,6 @@ EOF %{__rm} -f $RPM_BUILD_ROOT/%{mozappdir}/defaults/profile/bookmarks.html ln -s %{default_bookmarks_file} $RPM_BUILD_ROOT/%{mozappdir}/defaults/profile/bookmarks.html -%{__cat} %{SOURCE50} | %{__sed} -e 's,FFDIR,%{mozappdir},g' -e 's,LIBDIR,%{_libdir},g' > \ - $RPM_BUILD_ROOT/%{mozappdir}/firefox-xremote-client - -%{__chmod} 755 $RPM_BUILD_ROOT/%{mozappdir}/firefox-xremote-client %{__install} -p -D -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_mandir}/man1/firefox.1 %{__rm} -f $RPM_BUILD_ROOT/%{mozappdir}/firefox-config @@ -299,7 +294,6 @@ fi %{mozappdir}/icons %{mozappdir}/searchplugins %{mozappdir}/firefox -%{mozappdir}/firefox-xremote-client %{mozappdir}/run-mozilla.sh %{mozappdir}/application.ini %{mozappdir}/modules/distribution.js @@ -311,6 +305,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Jan 28 2008 Martin Stransky 3.0-0.beta2.13 +- cleared starting scripts, removed useless parts + * Mon Jan 21 2008 Christopher Aillon 3.0-0.beta2.12 - Update to latest trunk (2008-01-21)