From 3ad1f950f20dcc998f98dc14510b6ed40d36ee49 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: May 22 2020 19:44:20 +0000
Subject: Fix mingw_meson resulting in ERROR: Unable to determine dynamic linker


---

diff --git a/macros.mingw32 b/macros.mingw32
index 87af379..719c7d7 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -152,8 +152,8 @@
 %mingw32_qmake_qt5 /usr/bin/mingw32-qmake-qt5
 
 %mingw32_meson %{mingw32_env} ; \
-  unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LDFLAGS; \\\
-  export CFLAGS="%{__global_cflags}" CXXFLAGS="%{__global_cxxflags}" LDFLAGS="%{__global_ldflags}"; \\\
+  unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
+  export CFLAGS="%{mingw32_cflags}" CXXFLAGS="%{mingw32_cflags}" LDFLAGS="%{mingw32_ldflags}"; \\\
   if test -f meson.build; then __mingw32_topdir=.; \\\
   elif test -f ../meson.build; then __mingw32_topdir=..; \\\
   else __mingw32_topdir=""; fi; \\\
diff --git a/macros.mingw64 b/macros.mingw64
index 39b4f4f..425bc13 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -152,8 +152,8 @@
 %mingw64_qmake_qt5 /usr/bin/mingw64-qmake-qt5
 
 %mingw64_meson %{mingw64_env} ; \
-  unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LDFLAGS; \\\
-  export CFLAGS="%{__global_cflags}" CXXFLAGS="%{__global_cxxflags}" LDFLAGS="%{__global_ldflags}"; \\\
+  unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
+  export CFLAGS="%{mingw64_cflags}" CXXFLAGS="%{mingw64_cflags}" LDFLAGS="%{mingw64_ldflags}"; \\\
   if test -f meson.build; then __mingw64_topdir=.; \\\
   elif test -f ../meson.build; then __mingw64_topdir=..; \\\
   else __mingw64_topdir=""; fi; \\\
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index d3fd47b..072d1cf 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        111
+Version:        112
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -317,6 +317,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Fri May 22 2020 Sandro Mani <manisandro@gmail.com> - 112-1
+- Fix %%mingw_meson resulting in ERROR: Unable to determine dynamic linker
+
 * Fri May 01 2020 David Woodhouse <dwmw2@infradead.org> - 111-1
 - Quote tr sequences like '[blank]' to prevent the shell from doing so (#1830233)