rpms/seamonkey/devel seamonkey.sh.in, 1.2, 1.3 seamonkey.spec, 1.23, 1.24
Martin Stransky (stransky)
fedora-extras-commits at redhat.com
Mon Aug 6 11:14:43 UTC 2007
Author: stransky
Update of /cvs/pkgs/rpms/seamonkey/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16978
Modified Files:
seamonkey.sh.in seamonkey.spec
Log Message:
unwrapped plugins moved to the old location
Index: seamonkey.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/seamonkey.sh.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- seamonkey.sh.in 31 Jul 2007 11:25:20 -0000 1.2
+++ seamonkey.sh.in 6 Aug 2007 11:14:10 -0000 1.3
@@ -51,6 +51,17 @@
export MOZILLA_FIVE_HOME
##
+## Select the propper plugin dir
+## Wrapped plug-ins are located in /lib/mozilla/plugins-wrapped
+##
+if [ -x "LIBDIR/nspluginwrapper/npviewer" ]
+then
+ MOZ_PLUGIN_DIR="plugins-wrapped"
+else
+ MOZ_PLUGIN_DIR="plugins"
+fi
+
+##
## Set LD_LIBRARY_PATH
##
if [ "$LD_LIBRARY_PATH" ]
@@ -67,9 +78,9 @@
##
if [ "$MOZ_PLUGIN_PATH" ]
then
- MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:LIBDIR/mozilla/plugins-wrapped:LIBDIR/seamonkey-MOZILLA_VERSION/plugins-wrapped
+ MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:LIBDIR/mozilla/$MOZ_PLUGIN_DIR:LIBDIR/seamonkey-MOZILLA_VERSION/plugins
else
- MOZ_PLUGIN_PATH=LIBDIR/mozilla/plugins-wrapped:LIBDIR/seamonkey-MOZILLA_VERSION/plugins-wrapped
+ MOZ_PLUGIN_PATH=LIBDIR/mozilla/$MOZ_PLUGIN_DIR:LIBDIR/seamonkey-MOZILLA_VERSION/plugins
fi
export MOZ_PLUGIN_PATH
@@ -113,7 +124,13 @@
# OK, here's where all the real work gets done
# Configure plugins
-/usr/bin/seamonkey-plugin-config
+##
+## If plugins are wrapped, check them
+##
+if [ -x "LIBDIR/nspluginwrapper/npviewer" ]
+then
+ /usr/bin/seamonkey-plugin-config
+fi
# check to see if there's an already running instance or not
ALREADY_RUNNING=`check_running`
Index: seamonkey.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- seamonkey.spec 31 Jul 2007 11:25:20 -0000 1.23
+++ seamonkey.spec 6 Aug 2007 11:14:10 -0000 1.24
@@ -15,7 +15,7 @@
Name: seamonkey
Summary: Web browser, e-mail, news, IRC client, HTML editor
Version: 1.1.3
-Release: 4%{?dist}
+Release: 5%{?dist}
URL: http://www.mozilla.org/projects/seamonkey/
License: MPL
Group: Applications/Internet
@@ -464,6 +464,8 @@
%changelog
+* Mon Aug 6 2007 Martin Stransky <stransky at redhat.com> 1.1.3-5
+- unwrapped plugins moved to the old location
* Mon Jul 30 2007 Martin Stransky <stransky at redhat.com> 1.1.3-4
- added nspluginwrapper support
* Fri Jul 27 2007 Martin Stransky <stransky at redhat.com> - 1.1.3-3
More information about the scm-commits
mailing list