rpms/seamonkey/devel seamonkey-plugin-config.sh.in, NONE, 1.1 .cvsignore, 1.12, 1.13 seamonkey.sh.in, 1.1, 1.2 seamonkey.spec, 1.22, 1.23 sources, 1.12, 1.13

Martin Stransky (stransky) fedora-extras-commits at redhat.com
Tue Jul 31 11:25:52 UTC 2007 

Author: stransky

Update of /cvs/pkgs/rpms/seamonkey/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10295

Modified Files:
	.cvsignore seamonkey.sh.in seamonkey.spec sources 
Added Files:
	seamonkey-plugin-config.sh.in 
Log Message:
added nspluginwrapper support


--- NEW FILE seamonkey-plugin-config.sh.in ---
#!/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:
##
## $ seamonkey-plugin-config
##
## This script is meant to configure plugins from the mozilla
## rpm installation.

cmdname=`basename $0`

##
## Variables
##
MOZ_DIST_BIN="LIBDIR/seamonkey-MOZILLA_VERSION"

# Set-up installed plugins
$MOZ_DIST_BIN/plugin-configuration -c -f -q > /dev/null 2>&1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	20 Jul 2007 03:11:56 -0000	1.12
+++ .cvsignore	31 Jul 2007 11:25:20 -0000	1.13
@@ -1 +1,2 @@
 seamonkey-1.1.3.source.tar.bz2
+plugin-config-1.1.tar.gz


Index: seamonkey.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/seamonkey.sh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seamonkey.sh.in	10 Apr 2006 21:58:25 -0000	1.1
+++ seamonkey.sh.in	31 Jul 2007 11:25:20 -0000	1.2
@@ -67,9 +67,9 @@
 ##
 if [ "$MOZ_PLUGIN_PATH" ]
 then
-  MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:LIBDIR/mozilla/plugins:LIBDIR/seamonkey-MOZILLA_VERSION/plugins
+  MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:LIBDIR/mozilla/plugins-wrapped:LIBDIR/seamonkey-MOZILLA_VERSION/plugins-wrapped
 else
-  MOZ_PLUGIN_PATH=LIBDIR/mozilla/plugins:LIBDIR/seamonkey-MOZILLA_VERSION/plugins
+  MOZ_PLUGIN_PATH=LIBDIR/mozilla/plugins-wrapped:LIBDIR/seamonkey-MOZILLA_VERSION/plugins-wrapped
 fi
 export MOZ_PLUGIN_PATH
 
@@ -112,6 +112,9 @@
 
 # OK, here's where all the real work gets done
 
+# Configure plugins
+/usr/bin/seamonkey-plugin-config
+
 # 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- seamonkey.spec	27 Jul 2007 12:34:15 -0000	1.22
+++ seamonkey.spec	31 Jul 2007 11:25:20 -0000	1.23
@@ -8,17 +8,22 @@
 %define builddir %{_builddir}/mozilla
 %define mozdir %{_libdir}/seamonkey-%{version}
 
+%define plugin_config_version 1.1
+%define plugin_config_name plugin-config-%{plugin_config_version}
+%define plugin_config_binary plugin-configuration
+
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.1.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
 
 Source0:        seamonkey-%{version}.source.tar.bz2
-Source1:        seamonkey.sh.in
+Source1:        plugin-config-1.1.tar.gz
 Source2:        seamonkey-icon.png
+Source3:        seamonkey.sh.in
 Source4:        seamonkey.desktop
 Source7:        seamonkey-make-package.pl
 Source10:       seamonkey-mozconfig
@@ -28,6 +33,7 @@
 Source18:       mozilla-xpcom-exclude-list
 Source19:       seamonkey-fedora-default-bookmarks.html
 Source20:       seamonkey-fedora-default-prefs.js
+Source21:       seamonkey-plugin-config.sh.in
 Source100:      find-external-requires
 
 Patch1:         firefox-1.0-prdtoa.patch
@@ -112,7 +118,7 @@
 
 %prep
 
-%setup -q -n mozilla
+%setup -q -n mozilla -a 1
 %patch1  -p0
 %patch2  -p1
 %patch21 -p1
@@ -157,6 +163,11 @@
 BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 make export
 BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 make %{?_smp_mflags} libs
 
+#Build plugin configuration utility
+pushd %{plugin_config_name}
+./configure --prefix=/usr CFLAGS="$RPM_OPT_FLAGS"
+make
+popd
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -294,12 +305,19 @@
 fi
 
 # install our seamonkey.sh file
-cat %{SOURCE1} | sed -e 's/MOZILLA_VERSION/%{version}/g' \
+cat %{SOURCE3} | sed -e 's/MOZILLA_VERSION/%{version}/g' \
 		     -e 's,LIBDIR,%{_libdir},g' > \
   $RPM_BUILD_ROOT/usr/bin/seamonkey
 
 chmod 755 $RPM_BUILD_ROOT/usr/bin/seamonkey
 
+# install our seamonkey-plugin-config.sh file
+cat %{SOURCE21} | sed -e 's/MOZILLA_VERSION/%{version}/g' \
+		     -e 's,LIBDIR,%{_libdir},g' > \
+  $RPM_BUILD_ROOT/usr/bin/seamonkey-plugin-config
+
+chmod 755 $RPM_BUILD_ROOT/usr/bin/seamonkey-plugin-config
+
 # set up our default preferences
 %{__cat} %{SOURCE20} | %{__sed} -e 's,SEAMONKEY_RPM_VR,%{version}-%{release},g' > \
         $RPM_BUILD_ROOT/fc-default-prefs
@@ -309,6 +327,7 @@
 # we use /usr/lib/mozilla/plugins which is the version-independent
 # place that plugins can be installed
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/mozilla/plugins
+%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/mozilla/plugins-wrapped
 
 # ghost files
 touch $RPM_BUILD_ROOT%{mozdir}/chrome/chrome.rdf
@@ -325,6 +344,16 @@
 touch $RPM_BUILD_ROOT%{mozdir}/components/compreg.dat
 touch $RPM_BUILD_ROOT%{mozdir}/components/xpti.dat
 
+# Install plugin-config utility
+pushd %{plugin_config_name}
+DESTDIR=$RPM_BUILD_ROOT make install
+
+cd $RPM_BUILD_ROOT/usr/bin
+mv %{plugin_config_binary} $RPM_BUILD_ROOT%{mozdir}
+
+cd $RPM_BUILD_ROOT/usr/doc
+mv plugin-config $RPM_BUILD_ROOT%{mozdir}
+popd
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -341,6 +370,7 @@
 %files -f seamonkey.list
 %defattr(-,root,root)
 %{_bindir}/seamonkey
+%{_bindir}/seamonkey-plugin-config
 %{_datadir}/pixmaps/seamonkey-icon.png
 %{_datadir}/pixmaps/seamonkey-mail-icon.png
 
@@ -350,6 +380,7 @@
 %{_mandir}/man1/seamonkey.1.gz
 
 %dir %{_libdir}/mozilla/plugins
+%dir %{_libdir}/mozilla/plugins-wrapped
 
 %dir %{mozdir}
 %dir %{mozdir}/init.d
@@ -428,8 +459,13 @@
 %{_datadir}/applications/mozilla-%{name}.desktop
 %{_datadir}/applications/mozilla-%{name}-mail.desktop
 
+%{mozdir}/%{plugin_config_binary}
+%{mozdir}/plugin-config/*
+
 
 %changelog
+* 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
 - added pango patches
 * Fri Jul 20 2007 Kai Engert <kengert at redhat.com> - 1.1.3-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/seamonkey/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	20 Jul 2007 03:11:56 -0000	1.12
+++ sources	31 Jul 2007 11:25:20 -0000	1.13
@@ -1 +1,2 @@
 adede0ee02c302011ecd49f8e83e7c0f  seamonkey-1.1.3.source.tar.bz2
+92d71693f1d9d77c0a4d2fcc63de17b2  plugin-config-1.1.tar.gz

More information about the fedora-extras-commits mailing list