From cf8e665f2ccfd2ec4789f374f10f74a2c49ac437 Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <epienbro@fedoraproject.org>
Date: Tue, 6 Mar 2012 17:53:51 +0100
Subject: [PATCH] Use mingw macros without leading underscore

---
 mingw-cairo.spec | 53 ++++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/mingw-cairo.spec b/mingw-cairo.spec
index 9328743..f93d39f 100644
--- a/mingw-cairo.spec
+++ b/mingw-cairo.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-cairo
 Version:        1.10.2
@@ -72,7 +72,7 @@ Static version of the MinGW Windows Cairo library.
 
 
 %build
-%{_mingw32_configure} \
+%{mingw32_configure} \
   --disable-xlib \
   --disable-xcb \
   --enable-win32 \
@@ -88,8 +88,8 @@ make %{?_smp_mflags}
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
 
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/charset.alias
-rm -r $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc/html/cairo/
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/charset.alias
+rm -r $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc/html/cairo/
 
 # Drop all .la files
 find $RPM_BUILD_ROOT -name "*.la" -delete
@@ -97,33 +97,34 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 
 %files -n mingw32-cairo
 %doc COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1
-%{_mingw32_bindir}/libcairo-2.dll
-%{_mingw32_bindir}/libcairo-gobject-2.dll
-%{_mingw32_bindir}/libcairo-script-interpreter-2.dll
-%{_mingw32_includedir}/cairo/
-%{_mingw32_libdir}/libcairo.dll.a
-%{_mingw32_libdir}/libcairo-gobject.dll.a
-%{_mingw32_libdir}/libcairo-script-interpreter.dll.a
-%{_mingw32_libdir}/pkgconfig/cairo-fc.pc
-%{_mingw32_libdir}/pkgconfig/cairo-ft.pc
-%{_mingw32_libdir}/pkgconfig/cairo-gobject.pc
-%{_mingw32_libdir}/pkgconfig/cairo-pdf.pc
-%{_mingw32_libdir}/pkgconfig/cairo-png.pc
-%{_mingw32_libdir}/pkgconfig/cairo-ps.pc
-%{_mingw32_libdir}/pkgconfig/cairo-svg.pc
-%{_mingw32_libdir}/pkgconfig/cairo-win32-font.pc
-%{_mingw32_libdir}/pkgconfig/cairo-win32.pc
-%{_mingw32_libdir}/pkgconfig/cairo.pc
+%{mingw32_bindir}/libcairo-2.dll
+%{mingw32_bindir}/libcairo-gobject-2.dll
+%{mingw32_bindir}/libcairo-script-interpreter-2.dll
+%{mingw32_includedir}/cairo/
+%{mingw32_libdir}/libcairo.dll.a
+%{mingw32_libdir}/libcairo-gobject.dll.a
+%{mingw32_libdir}/libcairo-script-interpreter.dll.a
+%{mingw32_libdir}/pkgconfig/cairo-fc.pc
+%{mingw32_libdir}/pkgconfig/cairo-ft.pc
+%{mingw32_libdir}/pkgconfig/cairo-gobject.pc
+%{mingw32_libdir}/pkgconfig/cairo-pdf.pc
+%{mingw32_libdir}/pkgconfig/cairo-png.pc
+%{mingw32_libdir}/pkgconfig/cairo-ps.pc
+%{mingw32_libdir}/pkgconfig/cairo-svg.pc
+%{mingw32_libdir}/pkgconfig/cairo-win32-font.pc
+%{mingw32_libdir}/pkgconfig/cairo-win32.pc
+%{mingw32_libdir}/pkgconfig/cairo.pc
 
 %files mingw32-cairo-static
-%{_mingw32_libdir}/libcairo.a
-%{_mingw32_libdir}/libcairo-gobject.a
-%{_mingw32_libdir}/libcairo-script-interpreter.a
+%{mingw32_libdir}/libcairo.a
+%{mingw32_libdir}/libcairo-gobject.a
+%{mingw32_libdir}/libcairo-script-interpreter.a
 
 
 %changelog
 * Tue Mar 06 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.10.2-10
 - Renamed the source package to mingw-cairo (RHBZ #800373)
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.10.2-9
 - Rebuild against the mingw-w64 toolchain