SOURCES/macros.mingw32

@@ -151,8 +151,8 @@
 %mingw32_qmake_qt5 /usr/bin/mingw32-qmake-qt5
 
 %mingw32_meson %{mingw32_env} ; \
-  unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LDFLAGS; \\\
+  unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
-  export CFLAGS="%{__global_cflags}" CXXFLAGS="%{__global_cxxflags}" LDFLAGS="%{__global_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; \\\

SOURCES/macros.mingw64

@@ -151,8 +151,8 @@
 %mingw64_qmake_qt5 /usr/bin/mingw64-qmake-qt5
 
 %mingw64_meson %{mingw64_env} ; \
-  unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LDFLAGS; \\\
+  unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
-  export CFLAGS="%{__global_cflags}" CXXFLAGS="%{__global_cxxflags}" LDFLAGS="%{__global_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; \\\

SOURCES/toolchain-mingw32.meson

@@ -8,6 +8,8 @@ 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'
+dlltool = '/usr/bin/i686-w64-mingw32-dlltool'
+libgcrypt-config = '/usr/i686-w64-mingw32/sys-root/mingw/bin/libgcrypt-config'
 
 [properties]
 root = '/usr/i686-w64-mingw32/sys-root/mingw'

SOURCES/toolchain-mingw64.meson

@@ -8,6 +8,8 @@ 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'
+dlltool = '/usr/bin/x86_64-w64-mingw32-dlltool'
+libgcrypt-config = '/usr/x86_64-w64-mingw32/sys-root/mingw/bin/libgcrypt-config'
 
 [properties]
 root = '/usr/x86_64-w64-mingw32/sys-root/mingw'

SPECS/mingw-filesystem.spec

@@ -7,7 +7,7 @@
 
 Name:           mingw-filesystem
 Version:        104
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 Group:          Development/Libraries
@@ -49,11 +49,7 @@ BuildRequires:  iso-codes
 
 %description
 This package contains the base filesystem layout, RPM macros and
-environment for all Fedora MinGW packages.
+environment for all MinGW packages.
-
-This environment is maintained by the Fedora MinGW SIG at:
-
-  http://fedoraproject.org/wiki/SIGs/MinGW
 
 
 %package base
@@ -67,11 +63,7 @@ Obsoletes:      mingw-filesystem-scripts < 75-2
 
 %description base
 This package contains the base filesystem layout, RPM macros and
-environment for all Fedora MinGW packages.
+environment for all MinGW packages.
-
-This environment is maintained by the Fedora MinGW SIG at:
-
-  http://fedoraproject.org/wiki/SIGs/MinGW
 
 
 %package -n mingw32-filesystem
@@ -97,11 +89,7 @@ Provides:       mingw32(mscoree.dll)
 
 %description -n mingw32-filesystem
 This package contains the base filesystem layout, RPM macros and
-environment for all Fedora MinGW packages.
+environment for all MinGW packages.
-
-This environment is maintained by the Fedora MinGW SIG at:
-
-  http://fedoraproject.org/wiki/SIGs/MinGW
 
 
 %package -n mingw64-filesystem
@@ -113,11 +101,7 @@ Provides:       mingw64(mscoree.dll)
 
 %description -n mingw64-filesystem
 This package contains the base filesystem layout, RPM macros and
-environment for all Fedora MinGW packages.
+environment for all MinGW packages.
-
-This environment is maintained by the Fedora MinGW SIG at:
-
-  http://fedoraproject.org/wiki/SIGs/MinGW
 
 
 %prep
@@ -317,6 +301,15 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Thu Aug 05 2021 Uri Lublin <uril@redhat.com>
+- Update package description
+  Resolves: rhbz#1932299
+
+* Thu Feb 04 2021 Uri Lublin <uril@redhat.com> - 104-2
+- Fix building with meson >= 0.54
+  Resolves: rhbz#1918306
+  Related:  rhbz#1872692
+
 * Fri Apr 20 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 104-1
 - Add macros for meson and ninja