[mingw-glibmm24: 40/40] Use mingw macros without leading underscore

[epienbro]

commit 955e42408ff63dc31801ee206c768f0e973df620
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Mar 7 18:13:49 2012 +0100

    Use mingw macros without leading underscore

 mingw-glibmm24.spec |   41 +++++++++++++++++++++--------------------
 1 files changed, 21 insertions(+), 20 deletions(-)
---
diff --git a/mingw-glibmm24.spec b/mingw-glibmm24.spec
index 24e7157..5e57f0b 100644
--- a/mingw-glibmm24.spec
+++ b/mingw-glibmm24.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}
 
 # first two digits of version
 %define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
@@ -46,7 +46,7 @@ inheritance and a comprehensive set of widget classes that can be
 freely combined to quickly create complex user interfaces.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -55,7 +55,7 @@ freely combined to quickly create complex user interfaces.
 %patch1 -p0 -b .mingw
 
 %build
-%{_mingw32_configure} --disable-static
+%{mingw32_configure} --disable-static
 make %{?_smp_mflags}
 
 
@@ -63,31 +63,32 @@ make %{?_smp_mflags}
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # Remove .la files
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
 # Remove docs, duplicate native package.
-rm -r $RPM_BUILD_ROOT%{_mingw32_docdir}/glibmm-2.4
-rm -r $RPM_BUILD_ROOT%{_mingw32_datadir}/devhelp
+rm -r $RPM_BUILD_ROOT%{mingw32_docdir}/glibmm-2.4
+rm -r $RPM_BUILD_ROOT%{mingw32_datadir}/devhelp
 
 
 %files -n mingw32-glibmm24
 %doc COPYING COPYING.tools
-%{_mingw32_bindir}/libgiomm-2.4-1.dll
-%{_mingw32_bindir}/libglibmm-2.4-1.dll
-%{_mingw32_bindir}/libglibmm_generate_extra_defs-2.4-1.dll
-%{_mingw32_libdir}/libgiomm-2.4.dll.a
-%{_mingw32_libdir}/libglibmm-2.4.dll.a
-%{_mingw32_libdir}/libglibmm_generate_extra_defs-2.4.dll.a
-%{_mingw32_libdir}/giomm-2.4
-%{_mingw32_libdir}/glibmm-2.4
-%{_mingw32_includedir}/giomm-2.4
-%{_mingw32_includedir}/glibmm-2.4
-%{_mingw32_libdir}/pkgconfig/giomm-2.4.pc
-%{_mingw32_libdir}/pkgconfig/glibmm-2.4.pc
+%{mingw32_bindir}/libgiomm-2.4-1.dll
+%{mingw32_bindir}/libglibmm-2.4-1.dll
+%{mingw32_bindir}/libglibmm_generate_extra_defs-2.4-1.dll
+%{mingw32_libdir}/libgiomm-2.4.dll.a
+%{mingw32_libdir}/libglibmm-2.4.dll.a
+%{mingw32_libdir}/libglibmm_generate_extra_defs-2.4.dll.a
+%{mingw32_libdir}/giomm-2.4
+%{mingw32_libdir}/glibmm-2.4
+%{mingw32_includedir}/giomm-2.4
+%{mingw32_includedir}/glibmm-2.4
+%{mingw32_libdir}/pkgconfig/giomm-2.4.pc
+%{mingw32_libdir}/pkgconfig/glibmm-2.4.pc
 
 
 %changelog
 * Wed Mar 07 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.31.2-4
 - Renamed the source package to mingw-glibmm24 (RHBZ #800875)
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Kalev Lember <kalevlember at gmail.com> - 2.31.2-3
 - Remove .la files