[mingw-matahari: 15/15] Use mingw macros without leading underscore

[Kalev Lember]

commit f9f0ca313035ca9385d9b5beec1b5140d07d5731
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 7 17:58:39 2012 +0200

    Use mingw macros without leading underscore

 mingw-matahari.spec |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/mingw-matahari.spec b/mingw-matahari.spec
index ee43f9b..361c754 100644
--- a/mingw-matahari.spec
+++ b/mingw-matahari.spec
@@ -1,5 +1,5 @@
-%global __strip %{_mingw32_strip}
-%global __objdump %{_mingw32_objdump}
+%global __strip %{mingw32_strip}
+%global __objdump %{mingw32_objdump}
 
 # Choose a versioning scheme
 %bcond_with pre_release
@@ -72,9 +72,9 @@ MinGW cross-compiled Windows application.
 %patch0 -p0
 
 %build
-PATH=%{_mingw32_bindir}:$PATH
+PATH=%{mingw32_bindir}:$PATH
 
-%{_mingw32_cmake} --debug-output -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_VERBOSE_MAKEFILE=on
+%{mingw32_cmake} --debug-output -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_VERBOSE_MAKEFILE=on
 make VERBOSE=1 %{?_smp_mflags}
 
 %install
@@ -83,21 +83,22 @@ rm -rf $RPM_BUILD_ROOT
 make VERBOSE=1 %{?_smp_mflags} package
 genisoimage -o matahari-%{version}-win32.iso matahari-%{version}-win32.exe src/windows/autorun.inf
 
-%{__install} -d $RPM_BUILD_ROOT/%{_mingw32_datadir}/matahari
-%{__install} matahari-%{version}-win32.iso $RPM_BUILD_ROOT/%{_mingw32_datadir}/matahari
+%{__install} -d $RPM_BUILD_ROOT/%{mingw32_datadir}/matahari
+%{__install} matahari-%{version}-win32.iso $RPM_BUILD_ROOT/%{mingw32_datadir}/matahari
 
 %clean
 test "x%{buildroot}" != "x" && rm -rf %{buildroot}
 
 %files -n mingw32-matahari
 %defattr(-,root,root,-)
-%{_mingw32_datadir}/matahari
+%{mingw32_datadir}/matahari
 
 %doc AUTHORS COPYING
 
 %changelog
 * Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 0.5.0-1.4
 - Renamed the source package to mingw-matahari (#800974)
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.5.0-1.2
 - Rebuild against the mingw-w64 toolchain