From 27c6c2b1af1c0a45e8f068477e0bad01dde825d2 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Fri, 1 Oct 2004 20:27:28 +0000
Subject: [PATCH] filter out library Provides: and the internal Requires: on
 those provides.     Fixes depsolver confusion between
 mozilla/firefox/thunderbird copies of     libraries.

---
 find-external-requires | 23 +++++++++++++++++++++++
 firefox.spec           | 10 +++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100755 find-external-requires

diff --git a/find-external-requires b/find-external-requires
new file mode 100755
index 0000000..d79db1d
--- /dev/null
+++ b/find-external-requires
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# Finds requirements provided outside of the current file set
+
+filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"`
+
+provides=`echo $filelist | /usr/lib/rpm/find-provides`
+
+{
+for f in $filelist ; do
+	echo $f | /usr/lib/rpm/find-requires | while read req ; do
+		found=0
+		for p in $provides ; do
+			if [ "$req" = "$p" ]; then
+				found=1
+			fi
+		done
+		if [ "$found" = "0" ]; then
+			echo $req
+		fi
+	done
+done
+} | sort -u
\ No newline at end of file
diff --git a/firefox.spec b/firefox.spec
index 8d4817e..cb1eaa4 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -8,7 +8,7 @@ ExclusiveArch: i386 x86_64 ia64 ppc
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        0.10.0
-Release:        1.0PR1.6
+Release:        1.0PR1.7
 Epoch:          0
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
@@ -23,6 +23,7 @@ Source7:        firefox-xremote-client.sh.in
 Source8:        firefox.1
 Source9:        firefox-rebuild-databases.pl.in
 Source10:       firefox.xpm
+Source100:	find-external-requires
 Patch1:         firefox-redhat-homepage.patch
 Patch2:         firefox-0.7.3-default-plugin-less-annoying.patch
 Patch3:         firefox-0.7.3-psfonts.patch
@@ -45,6 +46,10 @@ Provides:       mozilla-firebird = %{epoch}:%{version}, MozillaFirebird = %{epoc
 Provides:       webclient
 %define ffdir %{_libdir}/firefox-%{version}
 
+AutoProv: 0
+%define _use_internal_dependency_generator 0
+%define __find_requires %{SOURCE100}
+
 %description
 Mozilla Firefox is an open-source web browser, designed for standards
 compliance, performance and portability.
@@ -177,6 +182,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Fri Oct  1 2004 Bill Nottingham <notting@redhat.com> 0:0.10.0-1.0PR1.7
+- filter out library Provides: and internal Requires:
+
 * Thu Sep 30 2004 Christopher Aillon <caillon@redhat.com> 0:0.10.0-1.0PR1.6
 - Prereq desktop-file-utils >= 0.9