From 69f2a864b1c97e813b947738977c506622868feda6836e999c095bfb1c20c65b Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Fri, 16 Jun 2023 20:27:14 +0000
Subject: [PATCH] Accepting request 1093499 from
 home:rhabacker:branches:windows:mingw:win64:cmake

- Update to 20230614
  * Fix unwanted dump of rpm option when using mingw64-* command
    line wrapper (boo#1212239)

OBS-URL: https://build.opensuse.org/request/show/1093499
OBS-URL: https://build.opensuse.org/package/show/windows:mingw:win64/mingw64-filesystem?expand=0&rev=161
---
 mingw64-filesystem.changes | 7 +++++++
 mingw64-filesystem.spec    | 2 +-
 mingw64-scripts.sh         | 7 +++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/mingw64-filesystem.changes b/mingw64-filesystem.changes
index 0cb71a7..32e6087 100644
--- a/mingw64-filesystem.changes
+++ b/mingw64-filesystem.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun 12 13:16:04 UTC 2023 - Ralf Habacker <ralf.habacker@freenet.de>
+
+- Update to 20230614
+  * Fix unwanted dump of rpm option when using mingw64-* command
+    line wrapper (boo#1212239)
+
 -------------------------------------------------------------------
 Tue Mar 28 04:05:34 UTC 2023 - Ralf Habacker <ralf.habacker@freenet.de>
 
diff --git a/mingw64-filesystem.spec b/mingw64-filesystem.spec
index f15eed8..6a5fad3 100644
--- a/mingw64-filesystem.spec
+++ b/mingw64-filesystem.spec
@@ -31,7 +31,7 @@
 %define _rpmmacrodir %{_sysconfdir}/rpm
 %endif
 Name:           mingw64-filesystem
-Version:        20230401
+Version:        20230614
 Release:        0
 Summary:        MinGW base filesystem and environment
 License:        GPL-2.0-or-later
diff --git a/mingw64-scripts.sh b/mingw64-scripts.sh
index b33aa5b..c2225d8 100644
--- a/mingw64-scripts.sh
+++ b/mingw64-scripts.sh
@@ -32,5 +32,8 @@
 # the internal default.
 
 NAME="_`basename $0|tr -- - _`"
-DEFINE=${MINGW64_MACROS:+--define="${MINGW64_MACROS}"}
-eval "`rpm "${DEFINE}" --eval "%${NAME} $(printf " %q" "${@}")"`"
+if [ "${MINGW64_MACROS+1}" ]; then
+    eval "`rpm --define="${MINGW64_MACROS}" --eval "%${NAME} $(printf " %q" "${@}")"`"
+else
+    eval "`rpm --eval "%${NAME} $(printf " %q" "${@}")"`"
+fi