[mingw-gdk-pixbuf: 22/22] Use mingw macros without leading underscore

[epienbro]

commit c257426be55eb4891b9a93eeb428eeea943181b6
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Tue Mar 6 20:22:14 2012 +0100

    Use mingw macros without leading underscore

 mingw-gdk-pixbuf.spec |   65 +++++++++++++++++++++++++------------------------
 1 files changed, 33 insertions(+), 32 deletions(-)
---
diff --git a/mingw-gdk-pixbuf.spec b/mingw-gdk-pixbuf.spec
index 2d061b7..b1b5eee 100644
--- a/mingw-gdk-pixbuf.spec
+++ b/mingw-gdk-pixbuf.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-gdk-pixbuf
 Version:        2.25.2
@@ -49,7 +49,7 @@ Summary:        MinGW Windows GDK Pixbuf library
 MinGW Windows GDK Pixbuf library.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -57,7 +57,7 @@ MinGW Windows GDK Pixbuf library.
 
 
 %build
-%{_mingw32_configure} \
+%{mingw32_configure} \
   --with-included-loaders=gdip-bmp,gdip-emf,gdip-gif,gdip-ico,gdip-jpeg,gdip-tiff,gdip-wmf,png \
   --with-libjasper
 make %{?_smp_mflags} V=1
@@ -69,55 +69,56 @@ make DESTDIR=$RPM_BUILD_ROOT install
 # The .def files are only used while compiling the libraries themselves
 # (they contain a list of functions which need to be exported by the linker)
 # so they serve no purpose for other libraries and applications
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gdk_pixbuf-2.0.def
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/gdk_pixbuf-2.0.def
 
 # The .dll.a files are import libraries, but as the regular .dll's are
 # only dlopen'ed by GTK they provide no additional value so they can be dropped
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/*.dll.a
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/*.dll.a
 
 # Drop all .la files
 find $RPM_BUILD_ROOT -name "*.la" -delete
 
 # The gtk-doc documentation and man pages can also be dropped as they're
 # already provided by the native package
-rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc
-rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc
+rm -rf $RPM_BUILD_ROOT%{mingw32_mandir}
 
 # Install the loaders.cache file
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache
 
 %find_lang %{name} --all-name
 
 
 %files -n mingw32-gdk-pixbuf -f %{name}.lang
 %doc COPYING
-%{_mingw32_bindir}/gdk-pixbuf-csource.exe
-%{_mingw32_bindir}/gdk-pixbuf-pixdata.exe
-%{_mingw32_bindir}/gdk-pixbuf-query-loaders.exe
-%{_mingw32_bindir}/libgdk_pixbuf-2.0-0.dll
-%dir %{_mingw32_libdir}/gdk-pixbuf-2.0
-%dir %{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0
-%dir %{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders
-%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache
-%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.dll
-%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.dll
-%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jasper.dll
-%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pcx.dll
-%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.dll
-%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.dll
-%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ras.dll
-%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.dll
-%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll
-%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.dll
-%{_mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.dll
-%{_mingw32_libdir}/libgdk_pixbuf-2.0.dll.a
-%{_mingw32_libdir}/pkgconfig/gdk-pixbuf-2.0.pc
-%{_mingw32_includedir}/gdk-pixbuf-2.0/
+%{mingw32_bindir}/gdk-pixbuf-csource.exe
+%{mingw32_bindir}/gdk-pixbuf-pixdata.exe
+%{mingw32_bindir}/gdk-pixbuf-query-loaders.exe
+%{mingw32_bindir}/libgdk_pixbuf-2.0-0.dll
+%dir %{mingw32_libdir}/gdk-pixbuf-2.0
+%dir %{mingw32_libdir}/gdk-pixbuf-2.0/2.10.0
+%dir %{mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders
+%{mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache
+%{mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.dll
+%{mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.dll
+%{mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jasper.dll
+%{mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pcx.dll
+%{mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.dll
+%{mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.dll
+%{mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ras.dll
+%{mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.dll
+%{mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll
+%{mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.dll
+%{mingw32_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.dll
+%{mingw32_libdir}/libgdk_pixbuf-2.0.dll.a
+%{mingw32_libdir}/pkgconfig/gdk-pixbuf-2.0.pc
+%{mingw32_includedir}/gdk-pixbuf-2.0/
 
 
 %changelog
 * Tue Mar 06 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.25.2-4
 - Renamed the source package to mingw-gdk-pixbuf (RHBZ #800383)
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.25.2-3
 - Rebuild against the mingw-w64 toolchain