[mingw-gtkmm24: 32/32] Use mingw macros without leading underscore

[epienbro]

commit 904705f498739eac75fc51217a70ca52c528d6dd
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Mar 7 18:28:24 2012 +0100

    Use mingw macros without leading underscore

 mingw-gtkmm24.spec |   43 ++++++++++++++++++++++---------------------
 1 files changed, 22 insertions(+), 21 deletions(-)
---
diff --git a/mingw-gtkmm24.spec b/mingw-gtkmm24.spec
index f6fdfa9..f2773e5 100644
--- a/mingw-gtkmm24.spec
+++ b/mingw-gtkmm24.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}
 
 Name:           mingw-gtkmm24
 Version:        2.24.2
@@ -46,48 +46,49 @@ 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
 %setup -q -n gtkmm-%{version}
 
 %build
-%{_mingw32_configure} --disable-static --enable-shared --disable-demos --disable-documentation
+%{mingw32_configure} --disable-static --enable-shared --disable-demos --disable-documentation
 make %{?_smp_mflags}
 
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
-rm -rf $RPM_BUILD_ROOT/%{_mingw32_datadir}/gtkmm-2.4/demo/
+rm -rf $RPM_BUILD_ROOT/%{mingw32_datadir}/gtkmm-2.4/demo/
 
 # hack: some headers are not available on win32
-sed -i -e "s,#include <gtkmm/pagesetupunixdialog.h>,," $RPM_BUILD_ROOT/%{_mingw32_includedir}/gtkmm-2.4/gtkmm.h
-sed -i -e "s,#include <gtkmm/printer.h>,," $RPM_BUILD_ROOT/%{_mingw32_includedir}/gtkmm-2.4/gtkmm.h
-sed -i -e "s,#include <gtkmm/printjob.h>,," $RPM_BUILD_ROOT/%{_mingw32_includedir}/gtkmm-2.4/gtkmm.h
-sed -i -e "s,#include <gtkmm/printunixdialog.h>,," $RPM_BUILD_ROOT/%{_mingw32_includedir}/gtkmm-2.4/gtkmm.h
+sed -i -e "s,#include <gtkmm/pagesetupunixdialog.h>,," $RPM_BUILD_ROOT/%{mingw32_includedir}/gtkmm-2.4/gtkmm.h
+sed -i -e "s,#include <gtkmm/printer.h>,," $RPM_BUILD_ROOT/%{mingw32_includedir}/gtkmm-2.4/gtkmm.h
+sed -i -e "s,#include <gtkmm/printjob.h>,," $RPM_BUILD_ROOT/%{mingw32_includedir}/gtkmm-2.4/gtkmm.h
+sed -i -e "s,#include <gtkmm/printunixdialog.h>,," $RPM_BUILD_ROOT/%{mingw32_includedir}/gtkmm-2.4/gtkmm.h
 
 # Remove .la files
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/*.la
+rm $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
 
 
 %files -n mingw32-gtkmm24
 %doc COPYING
-%{_mingw32_bindir}/libgdkmm-2.4-1.dll
-%{_mingw32_bindir}/libgtkmm-2.4-1.dll
-%{_mingw32_libdir}/libgdkmm-2.4.dll.a
-%{_mingw32_libdir}/libgtkmm-2.4.dll.a
-%{_mingw32_includedir}/gdkmm-2.4
-%{_mingw32_includedir}/gtkmm-2.4
-%{_mingw32_libdir}/gdkmm-2.4
-%{_mingw32_libdir}/gtkmm-2.4
-%{_mingw32_libdir}/pkgconfig/gdkmm-2.4.pc
-%{_mingw32_libdir}/pkgconfig/gtkmm-2.4.pc
+%{mingw32_bindir}/libgdkmm-2.4-1.dll
+%{mingw32_bindir}/libgtkmm-2.4-1.dll
+%{mingw32_libdir}/libgdkmm-2.4.dll.a
+%{mingw32_libdir}/libgtkmm-2.4.dll.a
+%{mingw32_includedir}/gdkmm-2.4
+%{mingw32_includedir}/gtkmm-2.4
+%{mingw32_libdir}/gdkmm-2.4
+%{mingw32_libdir}/gtkmm-2.4
+%{mingw32_libdir}/pkgconfig/gdkmm-2.4.pc
+%{mingw32_libdir}/pkgconfig/gtkmm-2.4.pc
 
 
 %changelog
 * Wed Mar 07 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.24.2-5
 - Renamed the source package to mingw-gtkmm24 (RHBZ #800880)
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.24.2-4
 - Rebuild against the mingw-w64 toolchain