From 508578c74b10c0a9cd860512791567d45f903df0 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Wed, 11 May 2022 11:42:42 +0200
Subject: [PATCH] Drop CMAKE_INSTALL_LIBDIR from mingw-cmake macros

Setting CMAKE_INSTALL_PREFIX is sufficient, lib relative to the CMAKE_INSTALL_PREFIX is default
---
 macros.mingw32        | 1 -
 macros.mingw64        | 1 -
 mingw-filesystem.spec | 5 ++++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/macros.mingw32 b/macros.mingw32
index 647d868..6caf0a2 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -138,7 +138,6 @@
         -DSYSCONF_INSTALL_DIR:PATH=%{mingw32_sysconfdir} \\\
         -DSHARE_INSTALL_PREFIX:PATH=%{mingw32_datadir} \\\
         -DCMAKE_INSTALL_PREFIX:PATH=%{mingw32_prefix} \\\
-        -DCMAKE_INSTALL_LIBDIR:PATH=%{mingw32_libdir} \\\
         ${MINGW_CMAKE_ARGS} \\\
         ${MINGW32_CMAKE_ARGS} \\\
         "$@" $__mingw32_topdir
diff --git a/macros.mingw64 b/macros.mingw64
index cecbc56..bf28141 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -138,7 +138,6 @@
         -DSYSCONF_INSTALL_DIR:PATH=%{mingw64_sysconfdir} \\\
         -DSHARE_INSTALL_PREFIX:PATH=%{mingw64_datadir} \\\
         -DCMAKE_INSTALL_PREFIX:PATH=%{mingw64_prefix} \\\
-        -DCMAKE_INSTALL_LIBDIR:PATH=%{mingw64_libdir} \\\
         ${MINGW_CMAKE_ARGS} \\\
         ${MINGW64_CMAKE_ARGS} \\\
         "$@" $__mingw64_topdir
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index c1ea4a2..03345c3 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:        137
+Version:        138
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -363,6 +363,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Wed May 11 2022 Sandro Mani <manisandro@gmail.com> - 138-1
+- Drop CMAKE_INSTALL_LIBDIR from mingw-cmake macros
+
 * Mon May 09 2022 Richard Hughes <richard@hughsie.com> 137-1
 - Include glib-mkenums in the toolchain binaries to avoid installing host GLib for building.