From dc495f1269f0792a0ffb4f48672017bd5f840235 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 28 Mar 2024 11:06:16 +0000 Subject: [PATCH] import CS mingw-filesystem-148-3.el9 --- SOURCES/mingw.prov | 10 ++++++++++ SPECS/mingw-filesystem.spec | 21 +++++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/SOURCES/mingw.prov b/SOURCES/mingw.prov index b877e16..1ce2ace 100755 --- a/SOURCES/mingw.prov +++ b/SOURCES/mingw.prov @@ -21,4 +21,14 @@ for f in $dlls; do done done +pcs=$(echo $filelist | tr '[:blank:]' '\n' | grep '\.pc$') + +for f in $pcs; do + basename=`basename $f .pc | tr '[:upper:]' '[:lower:]'` + for target in $targets; do + host_triplet=`rpm --eval "%{${target}_target}"` + [[ $f =~ .*$host_triplet.* ]] && echo "${target}-pkgconfig($basename)" + done +done + exit 0 diff --git a/SPECS/mingw-filesystem.spec b/SPECS/mingw-filesystem.spec index e671eed..f13a80e 100644 --- a/SPECS/mingw-filesystem.spec +++ b/SPECS/mingw-filesystem.spec @@ -9,8 +9,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: mingw-filesystem -Version: 147 -Release: 1%{?dist} +Version: 148 +Release: 3%{?dist} Summary: MinGW cross compiler base filesystem and environment License: GPL-2.0-or-later @@ -68,6 +68,8 @@ This environment is maintained by the Fedora MinGW SIG at: %package base Summary: Generic files which are needed for {mingw32,mingw64,ucrt64}-filesystem +# We need this for cmake macros +Requires: cmake-rpm-macros Requires: redhat-rpm-config # Obsolete the packages from the test repo Obsoletes: cross-filesystem < 67-2 @@ -376,6 +378,21 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 148-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 148-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Sep 13 2023 Orion Poplawski - 148-1 +- Add pkgconfig provides + +* Mon Sep 11 2023 Neal Gompa - 147-3 +- Add dependency on cmake-rpm-macros + +* Thu Jul 20 2023 Fedora Release Engineering - 147-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Apr 07 2023 Sandro Mani - 147-1 - Set mingw_env before in run_mingw_make