buc pushed to seamonkey (f20). "cleanup of the startup script (#1210035)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Apr 13 16:50:08 UTC 2015
>From 78e103f59b265feb68acddca4d068cc5f67bc52d Mon Sep 17 00:00:00 2001
From: buc <buc at grad.stu.neva.ru>
Date: Mon, 13 Apr 2015 19:50:49 +0300
Subject: cleanup of the startup script (#1210035)
diff --git a/seamonkey.sh.in b/seamonkey.sh.in
new file mode 100755
index 0000000..eadae15
--- /dev/null
+++ b/seamonkey.sh.in
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+#
+# Usage: seamonkey [-mail|-compose] [url]
+#
+# This script setup all the needed environment to make
+# seamonkey work properly.
+#
+
+
+MOZ_DIST_BIN=LIBDIR/seamonkey-MOZILLA_VERSION
+
+MOZILLA_FIVE_HOME=$MOZ_DIST_BIN
+export MOZILLA_FIVE_HOME
+
+LD_LIBRARY_PATH=$MOZ_DIST_BIN:$MOZ_DIST_BIN/plugins${LD_LIBRARY_PATH:+":$LD_LIBRARY_PATH"}
+export LD_LIBRARY_PATH
+
+
+MOZ_PLUGIN_DIR=LIBDIR/mozilla/plugins
+[ -x "/usr/bin/mozilla-plugin-config" -a -d "${MOZ_PLUGIN_DIR}-wrapped" ] && \
+ MOZ_PLUGIN_DIR=${MOZ_PLUGIN_DIR}-wrapped
+
+MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH:+"$MOZ_PLUGIN_PATH:"}$MOZ_PLUGIN_DIR:$MOZ_DIST_BIN/plugins
+export MOZ_PLUGIN_PATH
+
+
+#
+# Set MOZ_APP_LAUNCHER for gnome-session
+#
+export MOZ_APP_LAUNCHER="/usr/bin/seamonkey"
+
+#
+# Disable the GNOME crash dialog, Mozilla has it's own
+#
+GNOME_DISABLE_CRASH_DIALOG=1
+export GNOME_DISABLE_CRASH_DIALOG
+
+#
+# Disable the SLICE allocator (rhbz#1014858)
+#
+export G_SLICE=always-malloc
+
+# BEAST fix (rhbz#838879)
+NSS_SSL_CBC_RANDOM_IV=${NSS_SSL_CBC_RANDOM_IV-1}
+export NSS_SSL_CBC_RANDOM_IV
+
+
+#
+# It always opens a new window (or tab) in an already running instance
+# (if present), unless the `-new-instance' option is used
+#
+exec $MOZ_DIST_BIN/seamonkey "$@"
diff --git a/seamonkey.sh.in-2.33 b/seamonkey.sh.in-2.33
deleted file mode 100755
index 247be54..0000000
--- a/seamonkey.sh.in-2.33
+++ /dev/null
@@ -1,207 +0,0 @@
-#!/bin/sh
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s):
-#
-
-##
-## Usage:
-##
-## $ mozilla
-##
-## This script is meant to run a mozilla program from the mozilla
-## rpm installation.
-##
-## The script will setup all the environment voodoo needed to make
-## mozilla work.
-
-cmdname=`basename $0`
-
-## don't leave any core files around
-ulimit -c 0
-
-##
-## Variables
-##
-MOZ_DIST_BIN="LIBDIR/seamonkey-MOZILLA_VERSION"
-MOZ_PROGRAM="LIBDIR/seamonkey-MOZILLA_VERSION/seamonkey"
-MOZ_CLIENT_PROGRAM="LIBDIR/seamonkey-MOZILLA_VERSION/seamonkey -remote"
-MOZ_EXTENSIONS_DIR="$MOZ_DIST_BIN/extensions"
-
-##
-## Set MOZILLA_FIVE_HOME
-##
-MOZILLA_FIVE_HOME="LIBDIR/seamonkey-MOZILLA_VERSION"
-
-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=LIBDIR/seamonkey-MOZILLA_VERSION:LIBDIR/seamonkey-MOZILLA_VERSION/plugins:$LD_LIBRARY_PATH
-else
- LD_LIBRARY_PATH=LIBDIR/seamonkey-MOZILLA_VERSION:LIBDIR/seamonkey-MOZILLA_VERSION/plugins
-fi
-
-export LD_LIBRARY_PATH
-
-##
-## Make sure that we set the plugin path for backwards compatibility
-##
-if [ "$MOZ_PLUGIN_PATH" ]
-then
- MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:LIBDIR/mozilla/$MOZ_PLUGIN_DIR:LIBDIR/seamonkey-MOZILLA_VERSION/plugins
-else
- MOZ_PLUGIN_PATH=LIBDIR/mozilla/$MOZ_PLUGIN_DIR:LIBDIR/seamonkey-MOZILLA_VERSION/plugins
-fi
-export MOZ_PLUGIN_PATH
-
-##
-## Set MOZ_APP_LAUNCHER for gnome-session
-##
-export MOZ_APP_LAUNCHER="/usr/bin/seamonkey"
-
-##
-## Set MOZ_ENABLE_PANGO is no longer used because Pango is enabled by default
-## you may use MOZ_DISABLE_PANGO=1 to force disabling of pango
-##
-#MOZ_DISABLE_PANGO=1
-#export MOZ_DISABLE_PANGO
-
-##
-## Disable the GNOME crash dialog, Moz has it's own
-##
-GNOME_DISABLE_CRASH_DIALOG=1
-export GNOME_DISABLE_CRASH_DIALOG
-
-##
-## Disable the SLICE allocator (rhbz#1014858)
-##
-export G_SLICE=always-malloc
-
-# BEAST fix (rhbz#838879)
-NSS_SSL_CBC_RANDOM_IV=${NSS_SSL_CBC_RANDOM_IV-1}
-export NSS_SSL_CBC_RANDOM_IV
-
-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 open_mail() {
- if [ "${ALREADY_RUNNING}" -eq "1" ]; then
- exec $MOZ_CLIENT_PROGRAM '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 'xfeDoCommand(composeMessage)' \
- 2>/dev/null >/dev/null
- else
- exec $MOZ_PROGRAM $*
- fi
-}
-
-# OK, here's where all the real work gets done
-
-# 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}" -eq "1" ] && [ -z "$1" ]; then
- exec $MOZ_CLIENT_PROGRAM "xfeDoCommand(openBrowser)" 2>/dev/null >/dev/null
-fi
-
-# check system locale
-MOZARGS=
-# Try without a local variant first, then with a local variant
-# So that pt-BR doesn't try to use pt for example
-SHORTMOZLOCALE=`echo $LC_MESSAGES | sed "s|_\([^.]*\).*||g"`
-[ -f $MOZ_EXTENSIONS_DIR/langpack-${SHORTMOZLOCALE}@seamonkey.mozilla.org/chrome/$SHORTMOZLOCALE.jar ] && MOZARGS="-UILocale $SHORTMOZLOCALE"
-
-MOZLOCALE=`echo $LC_MESSAGES | sed "s|_\([^.]*\).*|-\1|g"`
-[ -f $MOZ_EXTENSIONS_DIR/langpack-${MOZLOCALE}@seamonkey.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
- # 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 "openurl($opt)" 2>/dev/null >/dev/null
- fi
- # just pass it off if it looks like a url
- exec $MOZ_CLIENT_PROGRAM "openurl($opt,new-window)" 2>/dev/null >/dev/null
-fi
-
-exec $MOZ_PROGRAM $MOZARGS ${1+"$@"}
diff --git a/seamonkey.spec b/seamonkey.spec
index 03b56ca..5e12c9a 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -25,7 +25,7 @@
Name: seamonkey
Summary: Web browser, e-mail, news, IRC client, HTML editor
Version: 2.33.1
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://www.mozilla.org/projects/seamonkey/
License: MPLv2.0
Group: Applications/Internet
@@ -40,7 +40,7 @@ Source0: ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{versi
#
Source1: seamonkey-langpacks-%{version}-20150326.tar.xz
-Source3: seamonkey.sh.in-2.33
+Source3: seamonkey.sh.in
Source4: seamonkey.desktop
Source7: seamonkey-make-package.pl
Source10: seamonkey-mozconfig
@@ -503,6 +503,12 @@ fi
%changelog
+* Mon Apr 13 2015 Dmitry Butskoy <Dmitry at Butskoy.name>
+- cleanup of the startup script (#1210035)
+
+* Mon Apr 6 2015 Tom Callaway <spot at fedoraproject.org> - 2.33.1-2
+- rebuild against libvpx 1.4.0
+
* Thu Mar 26 2015 Dmitry Butskoy <Dmitry at Butskoy.name> 2.33.1-1
- update to 2.33.1
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/seamonkey.git/commit/?h=f20&id=78e103f59b265feb68acddca4d068cc5f67bc52d
More information about the scm-commits
mailing list