From 2fdaf5a89a721f3c81880d694a64681e26455628 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Feb 14 2019 20:42:43 +0000 Subject: Revert "Remove redundant in mingw_cmake and mingw_meson" It causes no arguments at all to be passed to cmake --- diff --git a/macros.mingw32 b/macros.mingw32 index 4b4d68b..1e7bd36 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 78079f5..55857d6 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 d0d33d5..7fe492f 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: 105 +Version: 106 Release: 1%{?dist} Summary: MinGW cross compiler base filesystem and environment @@ -316,6 +316,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/ %changelog +* Thu Feb 14 2019 Sandro Mani - 106-1 +- Revert "Remove redundant $@ in mingw_cmake and mingw_meson", it causes no arguments at all to be passed to cmake + * Tue Feb 05 2019 Elliott Sales de Andrade - 105-1 - Remove redundant $@ in mingw_cmake and mingw_meson, breaking wrapper scripts