From b9ffd1b6a5e6963e47605328fe1997cbaa6fa47a Mon Sep 17 00:00:00 2001
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Feb 24 2022 13:53:59 +0000
Subject: Fix ucrt64 toolchain filenames.


Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

---

diff --git a/macros.ucrt64 b/macros.ucrt64
index f4880cc..acbde9e 100644
--- a/macros.ucrt64
+++ b/macros.ucrt64
@@ -130,7 +130,7 @@
     UCRT64_CMAKE_ARGS="${UCRT64_CMAKE_ARGS} -DCMAKE_VERBOSE_MAKEFILE=ON" \
   fi \
   PATH=%{_prefix}/%{ucrt64_target}/bin:$PATH %__cmake \\\
-        -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-mingw32ucrt64.cmake \\\
+        -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-ucrt64.cmake \\\
         -DBUILD_SHARED_LIBS:BOOL=ON \\\
         -DSYSCONF_INSTALL_DIR:PATH=%{ucrt64_sysconfdir} \\\
         -DSHARE_INSTALL_PREFIX:PATH=%{ucrt64_datadir} \\\
@@ -159,7 +159,7 @@
   elif test -f ../meson.build; then __ucrt64_topdir=..; \\\
   else __ucrt64_topdir=""; fi; \\\
   %__meson \\\
-        --cross-file /usr/share/mingw/toolchain-mingw32ucrt64.meson \\\
+        --cross-file /usr/share/mingw/toolchain-ucrt64.meson \\\
         --default-library shared \\\
         --prefix %{ucrt64_prefix} \\\
         --bindir %{ucrt64_bindir} \\\
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index b642c45..5889231 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -7,7 +7,7 @@
 
 Name:           mingw-filesystem
 Version:        133
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPLv2+
@@ -439,6 +439,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Thu Feb 24 2022 Marc-André Lureau <marcandre.lureau@redhat.com> - 133-2
+- Fix ucrt64 toolchain filenames.
+
 * Tue Feb 22 2022 Marc-André Lureau <marcandre.lureau@redhat.com> - 133-1
 - Add ucrt64 target. Related to rhbz#2055254.