filter out library Provides: and internal Requires: on those. fixes

depsolver confusion between mozilla/firefox/thunderbird copies of
    libraries.
This commit is contained in:
Bill Nottingham 2004-10-01 20:29:15 +00:00
parent 6f85560d81
commit c21eae0daa
2 changed files with 32 additions and 1 deletions

23
find-external-requires Executable file
View File

@ -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

View File

@ -8,7 +8,7 @@ ExclusiveArch: i386 x86_64 ia64 ppc
Summary: Mozilla Thunderbird mail/newsgroup client Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird Name: thunderbird
Version: 0.8.0 Version: 0.8.0
Release: 2 Release: 3
Epoch: 0 Epoch: 0
URL: http://www.mozilla.org/projects/thunderbird/ URL: http://www.mozilla.org/projects/thunderbird/
License: MPL License: MPL
@ -22,6 +22,7 @@ Source4: thunderbird-mozconfig
Source5: release-notes.html Source5: release-notes.html
Source6: thunderbird-open-browser.sh Source6: thunderbird-open-browser.sh
Source7: thunderbird-prefs Source7: thunderbird-prefs
Source100: find-external-requires
Patch1: thunderbird-0.7.3-em-register.patch Patch1: thunderbird-0.7.3-em-register.patch
Patch2: thunderbird-0.7.3-em-fileuri.patch Patch2: thunderbird-0.7.3-em-fileuri.patch
Patch3: thunderbird-0.7.3-enigmail-debian.patch Patch3: thunderbird-0.7.3-enigmail-debian.patch
@ -45,6 +46,10 @@ Provides: MozillaThunderbird = %{epoch}:%{version}
%define tbdir %{_libdir}/thunderbird-%{version} %define tbdir %{_libdir}/thunderbird-%{version}
AutoProv: 0
%define _use_internal_dependency_generator 0
%define __find_requires %{SOURCE100}
%description %description
Mozilla Thunderbird is a standalone mail and newsgroup client. Mozilla Thunderbird is a standalone mail and newsgroup client.
@ -133,6 +138,9 @@ rm -rf %{buildroot}/%{tbdir}/chrome/{classic,comm,embed-sample,en-{mac,win},help
#=============================================================================== #===============================================================================
%changelog %changelog
* Fri Oct 1 2004 Bill Nottingham <notting@redhat.com> 0.8.0-3
- filter out library Provides: and internal Requires:
* Tue Sep 28 2004 Christopher Aillon <caillon@redhat.com> 0.8.0-2 * Tue Sep 28 2004 Christopher Aillon <caillon@redhat.com> 0.8.0-2
- Backport the GTK+ File Chooser. - Backport the GTK+ File Chooser.
- Add fix for JS math on x86_64 systems - Add fix for JS math on x86_64 systems