[mingw-matahari: 12/15] Fix build on mingw-w64

[Kalev Lember]

commit 5c6207392500614f402095c220ba8ee26599e9d3
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Tue Feb 28 16:57:15 2012 +0100

    Fix build on mingw-w64

 matahari-mingw-w64-fix.patch |   11 +++++++++++
 mingw32-matahari.spec        |    6 +++++-
 2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/matahari-mingw-w64-fix.patch b/matahari-mingw-w64-fix.patch
new file mode 100644
index 0000000..db7176c
--- /dev/null
+++ b/matahari-mingw-w64-fix.patch
@@ -0,0 +1,11 @@
+--- src/cmake/modules/FindQPID.cmake.orig	2011-10-08 02:13:04.326892248 +0200
++++ src/cmake/modules/FindQPID.cmake	2011-10-08 02:13:21.998352925 +0200
+@@ -129,7 +129,7 @@
+    # Figure out the qpid version
+    if(WIN32)
+       find_file(QPIDD qpidd.exe)
+-      find_file(QMFGEN qmf-gen PATHS "/usr/i686-pc-mingw32/sys-root/mingw/managementgen")
++      find_file(QMFGEN qmf-gen PATHS "/usr/i686-w64-mingw32/sys-root/mingw/managementgen")
+       if(QPIDD)
+           execute_process(COMMAND strings ${QPIDD} OUTPUT_VARIABLE QPID_VERSION_LONG)
+           string(REGEX REPLACE ".*BUILD/qpid" " qpid" QPID_VERSION_LONG ${QPID_VERSION_LONG})
diff --git a/mingw32-matahari.spec b/mingw32-matahari.spec
index 35af22b..a999fb1 100644
--- a/mingw32-matahari.spec
+++ b/mingw32-matahari.spec
@@ -15,7 +15,7 @@
 
 Name:           mingw32-matahari
 Version:        0.5.0
-Release:        %{mh_release}%{?dist}.2
+Release:        %{mh_release}%{?dist}.3
 Summary:        Matahari QMF Agents for Windows guests
 
 Group:          Applications/System
@@ -25,6 +25,8 @@ URL:            http://fedorahosted.org/matahari
 # wget --no-check-certificate -O matahari-matahari-{upstream_version}.tgz https://github.com/matahari/matahari/tarball/{upstream_version}
 Source0:        matahari-%{version}.tar.gz
 
+Patch0:         matahari-mingw-w64-fix.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -51,6 +53,7 @@ MinGW cross-compiled Windows application.
 
 %prep
 %setup -q -n matahari-%{version}
+%patch0 -p0
 
 %build
 PATH=%{_mingw32_bindir}:$PATH
@@ -79,6 +82,7 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
 %changelog
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.5.0-1.2
 - Rebuild against the mingw-w64 toolchain
+- Fix build on mingw-w64
 
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild