[mingw-qwt: 21/21] Use mingw macros without leading underscore

[Kalev Lember]

commit 0400d5488b2c818448f5ab0b22ec1c2182e48f04
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 7 18:58:50 2012 +0200

    Use mingw macros without leading underscore

 mingw-qwt.spec |   37 +++++++++++++++++++------------------
 1 files changed, 19 insertions(+), 18 deletions(-)
---
diff --git a/mingw-qwt.spec b/mingw-qwt.spec
index b92a589..37b0b35 100644
--- a/mingw-qwt.spec
+++ b/mingw-qwt.spec
@@ -1,6 +1,6 @@
-%global __strip %{_mingw32_strip}
-%global __objdump %{_mingw32_objdump}
-%define __debug_install_post %{_mingw32_debug_install_post}
+%global __strip %{mingw32_strip}
+%global __objdump %{mingw32_objdump}
+%define __debug_install_post %{mingw32_debug_install_post}
 
 %global name1 qwt
 %global name2 %{name1}5
@@ -32,18 +32,18 @@ Summary:        MinGW Windows Qwt library
 MinGW Windows Qwt library.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
 %setup -qn %{name1}-%{version}
 %patch0 -p1
 #patch1 -p0 -b .qhash
-sed -i "s\LIBPATH\ $RPM_BUILD_ROOT%{_mingw32_libdir}\1" qwtconfig.pri
-sed -i "s\HEADERPATH\ $RPM_BUILD_ROOT%{_mingw32_includedir}/%{name1}\1" qwtconfig.pri
-sed -i "s\DOCKPATH\ $RPM_BUILD_ROOT%{_mingw32_docdir}/%{name1}\1" qwtconfig.pri
+sed -i "s\LIBPATH\ $RPM_BUILD_ROOT%{mingw32_libdir}\1" qwtconfig.pri
+sed -i "s\HEADERPATH\ $RPM_BUILD_ROOT%{mingw32_includedir}/%{name1}\1" qwtconfig.pri
+sed -i "s\DOCKPATH\ $RPM_BUILD_ROOT%{mingw32_docdir}/%{name1}\1" qwtconfig.pri
 #sed -i "s\QTDESIGNERPATH\ $RPM_BUILD_ROOT%{_qt4_plugindir}/designer\1" designer/designer.pro
-sed -i "s\QTDESIGNERPATH\ $RPM_BUILD_ROOT%{_mingw32_libdir}/qt4/plugins/designer\1" designer/designer.pro
+sed -i "s\QTDESIGNERPATH\ $RPM_BUILD_ROOT%{mingw32_libdir}/qt4/plugins/designer\1" designer/designer.pro
 #disable Designer
 sed -i "s\CONFIG *+= *QwtDesigner\#CONFIG += QwtDesigner\1" qwtconfig.pri
 #disable Examples
@@ -66,27 +66,28 @@ popd
 %install
 make install
 #remove unneeded stuff
-rm -rf $RPM_BUILD_ROOT%{_mingw32_docdir}/%{name1}
-%{__install} -d $RPM_BUILD_ROOT%{_mingw32_bindir}
-%{__mv} $RPM_BUILD_ROOT%{_mingw32_libdir}/%{name2}.dll $RPM_BUILD_ROOT%{_mingw32_bindir}/
-%{__cp} lib/%{name1}d5.dll $RPM_BUILD_ROOT%{_mingw32_bindir}/
-%{__cp} lib/lib%{name1}d5.a $RPM_BUILD_ROOT%{_mingw32_libdir}/
+rm -rf $RPM_BUILD_ROOT%{mingw32_docdir}/%{name1}
+%{__install} -d $RPM_BUILD_ROOT%{mingw32_bindir}
+%{__mv} $RPM_BUILD_ROOT%{mingw32_libdir}/%{name2}.dll $RPM_BUILD_ROOT%{mingw32_bindir}/
+%{__cp} lib/%{name1}d5.dll $RPM_BUILD_ROOT%{mingw32_bindir}/
+%{__cp} lib/lib%{name1}d5.a $RPM_BUILD_ROOT%{mingw32_libdir}/
 
 
 %files -n mingw32-%{name1}
 %doc CHANGES
 %doc COPYING
 %doc README
-%{_mingw32_bindir}/%{name2}.dll
-%{_mingw32_bindir}/%{name1}d5.dll
-%{_mingw32_includedir}/%{name1}
-%{_mingw32_libdir}/lib%{name2}.a
-%{_mingw32_libdir}/lib%{name1}d5.a
+%{mingw32_bindir}/%{name2}.dll
+%{mingw32_bindir}/%{name1}d5.dll
+%{mingw32_includedir}/%{name1}
+%{mingw32_libdir}/lib%{name2}.a
+%{mingw32_libdir}/lib%{name1}d5.a
 
 %changelog
 * Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 5.2.1-6
 - Renamed the source package to mingw-qwt (#801020)
 - Modernize the spec file
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.2.1-5
 - Rebuild against the mingw-w64 toolchain