From ed40f14dd0e9ed051f355c99c46165a0d3e2513c Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Feb 05 2019 23:14:32 +0000
Subject: Remove redundant $@ in mingw_cmake and mingw_meson.


$@ is not used by the RPM macro _in RPM_ since it is executed as a line
by itself, not a script or function.

There's already a $@ in the mingw-scripts.sh file, so when expanded from
the macro, the script contains two $@, sending redundant arguments to
cmake and meson.

---

diff --git a/macros.mingw32 b/macros.mingw32
index 1e7bd36..4b4d68b 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -137,7 +137,7 @@
         -DCMAKE_INSTALL_LIBDIR:PATH=%{mingw32_libdir} \\\
         ${MINGW_CMAKE_ARGS} \\\
         ${MINGW32_CMAKE_ARGS} \\\
-        "$@" $__mingw32_topdir
+        $__mingw32_topdir
 
 %mingw32_cmake \
   MINGW32_CMAKE_ARGS="${MINGW32_CMAKE_ARGS} -DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir}" \
@@ -173,7 +173,7 @@
         --infodir %{mingw32_infodir} \\\
         ${MINGW_MESON_ARGS} \\\
         ${MINGW32_MESON_ARGS} \\\
-        "$@" $__mingw32_topdir
+        $__mingw32_topdir
 
 %mingw32_description This is the cross-compiled version of this library / tool.\
 You should only install this package if you want to cross-compile programs for \
diff --git a/macros.mingw64 b/macros.mingw64
index 55857d6..78079f5 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -137,7 +137,7 @@
         -DCMAKE_INSTALL_LIBDIR:PATH=%{mingw64_libdir} \\\
         ${MINGW_CMAKE_ARGS} \\\
         ${MINGW64_CMAKE_ARGS} \\\
-        "$@" $__mingw64_topdir
+        $__mingw64_topdir
 
 %mingw64_cmake \
   MINGW64_CMAKE_ARGS="${MINGW64_CMAKE_ARGS} -DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir}" \
@@ -173,7 +173,7 @@
         --infodir %{mingw64_infodir} \\\
         ${MINGW_MESON_ARGS} \\\
         ${MINGW64_MESON_ARGS} \\\
-        "$@" $__mingw64_topdir
+        $__mingw64_topdir
 
 %mingw64_description This is the cross-compiled version of this library / tool.\
 You should only install this package if you want to cross-compile programs for \
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index ef49e8c..d0d33d5 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,8 +6,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        104
-Release:        3%{?dist}
+Version:        105
+Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPLv2+
@@ -316,6 +316,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Tue Feb 05 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 105-1
+- Remove redundant $@ in mingw_cmake and mingw_meson, breaking wrapper scripts
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild