macros.mingw32

@@ -162,7 +162,7 @@
   if test -f meson.build; then __mingw32_topdir=.; \\\
   elif test -f ../meson.build; then __mingw32_topdir=..; \\\
   else __mingw32_topdir=""; fi; \\\
-  %__meson setup \\\
+  %__meson \\\
         --cross-file /usr/share/mingw/toolchain-mingw32.meson \\\
         --default-library shared \\\
         --prefix %{mingw32_prefix} \\\

macros.mingw64

@@ -162,7 +162,7 @@
   if test -f meson.build; then __mingw64_topdir=.; \\\
   elif test -f ../meson.build; then __mingw64_topdir=..; \\\
   else __mingw64_topdir=""; fi; \\\
-  %__meson setup \\\
+  %__meson \\\
         --cross-file /usr/share/mingw/toolchain-mingw64.meson \\\
         --default-library shared \\\
         --prefix %{mingw64_prefix} \\\

macros.ucrt64

@@ -158,7 +158,7 @@
   if test -f meson.build; then __ucrt64_topdir=.; \\\
   elif test -f ../meson.build; then __ucrt64_topdir=..; \\\
   else __ucrt64_topdir=""; fi; \\\
-  %__meson setup \\\
+  %__meson \\\
         --cross-file /usr/share/mingw/toolchain-ucrt64.meson \\\
         --default-library shared \\\
         --prefix %{ucrt64_prefix} \\\

mingw-filesystem.spec

@@ -9,8 +9,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        150
-Release:        3%{?dist}
+Version:        148
+Release:        6%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPL-2.0-or-later
@@ -205,8 +205,6 @@ for target in i686-w64-mingw32 x86_64-w64-mingw32 x86_64-w64-mingw32ucrt; do
   mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/lib
   mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/lib/pkgconfig
   mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/lib/cmake
-  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/libexec
-  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/libexec/installed-tests
   mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/sbin
 
   # We don't normally package manual pages and info files, except
@@ -225,7 +223,6 @@ for target in i686-w64-mingw32 x86_64-w64-mingw32 x86_64-w64-mingw32ucrt; do
   mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/xml
   mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/icons
   mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/metainfo
-  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/installed-tests
 
   mkdir -p %{buildroot}%{_prefix}/lib/debug/%{_prefix}/$target
 done
@@ -381,24 +378,6 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
-* Wed Aug 20 2025 Marc-André Lureau <marcandre.lureau@redhat.com> - 150-3
-- Own a few more directories.
-
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 150-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Thu May 29 2025 Sandro Mani <manisandro@gmail.com> - 150-1
-- Re-add target bin dir to PATH
-
-* Sun Mar 23 2025 Sandro Mani <manisandro@gmail.com> - 149-1
-- Only add cross host tools bin dir to PATH
-
-* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 148-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Sep 07 2024 Zephyr Lykos <fedora@mochaa.ws> - 148-7
-- Fix meson deprecation warnings
-
 * Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 148-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

toolchain-mingw32.meson

@@ -4,7 +4,7 @@ cpp = 'i686-w64-mingw32-g++'
 fortran = 'i686-w64-mingw32-gfortran'
 rust = ['rustc', '--target', 'i686-pc-windows-gnu']
 ar = '/usr/bin/i686-w64-mingw32-ar'
-pkg-config = '/usr/bin/i686-w64-mingw32-pkg-config'
+pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config'
 ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib'
 strip = '/usr/bin/i686-w64-mingw32-strip'
 windres = '/usr/bin/i686-w64-mingw32-windres'

toolchain-mingw64.meson

@@ -4,7 +4,7 @@ cpp = 'x86_64-w64-mingw32-g++'
 fortran = 'x86_64-w64-mingw32-gfortran'
 rust = ['rustc', '--target', 'x86_64-pc-windows-gnu']
 ar = '/usr/bin/x86_64-w64-mingw32-ar'
-pkg-config = '/usr/bin/x86_64-w64-mingw32-pkg-config'
+pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
 ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib'
 strip = '/usr/bin/x86_64-w64-mingw32-strip'
 windres = '/usr/bin/x86_64-w64-mingw32-windres'

toolchain-ucrt64.meson

@@ -6,7 +6,7 @@ rust = ['rustc', '--target', 'x86_64-pc-windows-gnu']
 # XXX: there is no mingw/rustc target for UCRT yet, but this should do
 rust_ld = 'x86_64-w64-mingw32ucrt-gcc'
 ar = '/usr/bin/x86_64-w64-mingw32ucrt-ar'
-pkg-config = '/usr/bin/x86_64-w64-mingw32ucrt-pkg-config'
+pkgconfig = '/usr/bin/x86_64-w64-mingw32ucrt-pkg-config'
 ranlib = '/usr/bin/x86_64-w64-mingw32ucrt-ranlib'
 strip = '/usr/bin/x86_64-w64-mingw32ucrt-strip'
 windres = '/usr/bin/x86_64-w64-mingw32ucrt-windres'