From 9e2af704169d8d4acab5a26f187172faa28959eb Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 1 Feb 2021 21:59:11 +0100 Subject: [PATCH] Filter Windows API umbrella libraries from requires --- mingw-filesystem.spec | 9 ++++++--- mingw-find-requires.sh | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index bc7a9f8..4452a61 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -6,8 +6,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: mingw-filesystem -Version: 116 -Release: 2%{?dist} +Version: 117 +Release: 1%{?dist} Summary: MinGW cross compiler base filesystem and environment License: GPLv2+ @@ -318,7 +318,10 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/ %changelog -* Tue Jan 26 2021 Fedora Release Engineering +* Mon Feb 01 2021 Sandro Mani - 117-1 +- Filter Windows API umbrella libraries from requires + +* Tue Jan 26 2021 Fedora Release Engineering 116-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild * Mon Jul 27 2020 Sandro Mani - 116-1 diff --git a/mingw-find-requires.sh b/mingw-find-requires.sh index d824272..9e8e303 100755 --- a/mingw-find-requires.sh +++ b/mingw-find-requires.sh @@ -24,7 +24,7 @@ for target in $targets; do for f in $dlls; do if [[ $f =~ .*$host_triplet.* ]]; then $OBJDUMP -p $f | grep 'DLL Name' | grep -Eio '[-._\+[:alnum:]]+\.dll' | - tr '[:upper:]' '[:lower:]' | + grep -v 'api-ms-win' | tr '[:upper:]' '[:lower:]' | sed "s/\(.*\)/$target(\1)/" dll_found=true fi