From 6d3a5031a12a677f8a536c7d482ab0d723a22191 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Mon, 5 Feb 2007 17:42:03 +0000
Subject: [PATCH] - AC-branch merge (browser-plugins v2); rel 3

Changed files:
    seamonkey.spec -> 1.54
---
 seamonkey.spec | 48 +++++++++++++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/seamonkey.spec b/seamonkey.spec
index 1755ce8..1b74887 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -1,4 +1,3 @@
-# TODO: use browser-plugins framework
 #
 # Conditional build:
 %bcond_without	gnomevfs	# disable GnomeVFS support
@@ -12,7 +11,7 @@ Summary(pl):	SeaMonkey Community Edition - przegl
 Summary(pt_BR):	Navegador SeaMonkey Community Edition
 Name:		seamonkey
 Version:	1.1
-Release:	2
+Release:	3
 License:	Mozilla Public License
 Group:		X11/Applications/Networking
 Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/%{name}-%{version}.source.tar.bz2
@@ -43,6 +42,7 @@ BuildRequires:	nspr-devel >= 1:4.6.1
 BuildRequires:	nss-devel >= 1:3.11.3
 BuildRequires:	perl-modules >= 5.6.0
 BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.356
 BuildRequires:	sed >= 4.0
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXft-devel >= 2.1
@@ -54,6 +54,7 @@ BuildRequires:	zlib-devel >= 1.2.3
 Requires(post,postun):	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires(post,postun):	/sbin/ldconfig
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires:	browser-plugins >= 2.0
 %{?with_svg:Requires:	cairo >= 1.0.0}
 Requires:	nspr >= 1:4.6.1
 Requires:	nss >= 1:3.11.3
@@ -329,33 +330,33 @@ if [ "$1" == "-remote" ]; then
 fi
 
 PING=`$SEAMONKEY -remote 'ping()' 2>&1 >/dev/null`
-if [ -n "$PING" ]; then
-	if [ -f "`pwd`/$1" ]; then
+	if [ -n "$PING" ]; then
+		if [ -f "`pwd`/$1" ]; then
 		exec $SEAMONKEY "file://`pwd`/$1"
-	else
+		else
 		exec $SEAMONKEY "$@"
-	fi
+		fi
 fi
 
-if [ -z "$1" ]; then
+		if [ -z "$1" ]; then
 	exec $SEAMONKEY -remote 'xfeDoCommand (openBrowser)'
-elif [ "$1" == "-mail" ]; then
+		elif [ "$1" == "-mail" ]; then
 	exec $SEAMONKEY -remote 'xfeDoCommand (openInbox)'
-elif [ "$1" == "-compose" ]; then
+		elif [ "$1" == "-compose" ]; then
 	exec $SEAMONKEY -remote 'xfeDoCommand (composeMessage)'
 fi
 
 [[ $1 == -* ]] && exec $SEAMONKEY "$@"
 
-if [ -f "`pwd`/$1" ]; then
-	URL="file://`pwd`/$1"
-else
-	URL="$1"
-fi
+				if [ -f "`pwd`/$1" ]; then
+					URL="file://`pwd`/$1"
+				else
+					URL="$1"
+				fi
 if grep -q -E 'browser.tabs.opentabfor.middleclick.*true' \
 		~/.mozilla/default/*/prefs.js; then
 	exec $SEAMONKEY -remote "OpenUrl($URL,new-tab)"
-else
+				else
 	exec $SEAMONKEY -remote "OpenUrl($URL,new-window)"
 fi
 
@@ -379,11 +380,20 @@ MOZILLA_FIVE_HOME=%{_seamonkeydir} %{_seamonkeydir}/regchrome
 exit 0
 EOF
 
+%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p %{_sbindir}/%{name}-chrome+xpcom-generate
-%postun -p %{_sbindir}/%{name}-chrome+xpcom-generate
+%post
+%{_sbindir}/%{name}-chrome+xpcom-generate
+%update_browser_plugins
+
+%postun
+%{_sbindir}/%{name}-chrome+xpcom-generate
+if [ "$1" = 0 ]; then
+	%update_browser_plugins
+fi
 
 %post mailnews -p %{_sbindir}/%{name}-chrome+xpcom-generate
 %postun mailnews -p %{_sbindir}/%{name}-chrome+xpcom-generate
@@ -408,6 +418,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/seamonkey
 %attr(744,root,root) %{_sbindir}/%{name}-chrome+xpcom-generate
 
+# browser plugins v2
+%{_browserpluginsconfdir}/browsers.d/%{name}.*
+%config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
+
 %dir %{_chromedir}
 %dir %{_seamonkeydir}/components
 %dir %{_seamonkeydir}/defaults
-- 
2.44.0