[mingw-webkitgtk: 36/36] Use mingw macros without leading underscore

[Kalev Lember]

commit 15a6b2ed4abdc9d1c724fc90f8f8811162208d14
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Mar 6 23:07:49 2012 +0200

    Use mingw macros without leading underscore

 mingw-webkitgtk.spec |   45 +++++++++++++++++++++++----------------------
 1 files changed, 23 insertions(+), 22 deletions(-)
---
diff --git a/mingw-webkitgtk.spec b/mingw-webkitgtk.spec
index 0184557..a870924 100644
--- a/mingw-webkitgtk.spec
+++ b/mingw-webkitgtk.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}
 
 ## NOTE: Lots of files in various subdirectories have the same name (such as
 ## "LICENSE") so this short macro allows us to distinguish them by using their
@@ -133,7 +133,7 @@ Group:		Development/Libraries
 Static version of the MinGW Windows WebKitGTK+ library.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -153,7 +153,7 @@ autoreconf --verbose --install -I Source/autotools
 # lower debug level to prevent memory exhaustion by linker
 %global mingw32_cflags %(echo %{mingw32_cflags} | sed 's/-g /-g1 /')
 
-%{_mingw32_configure}						\
+%{mingw32_configure}						\
 			--with-target=win32			\
 			--with-gtk=2.0				\
 			--with-font-backend=freetype		\
@@ -173,13 +173,13 @@ make %{?_smp_mflags} V=99
 
 %install
 make install DESTDIR=%{buildroot}
-install -m 755 Programs/.libs/GtkLauncher.exe %{buildroot}%{_mingw32_bindir}
+install -m 755 Programs/.libs/GtkLauncher.exe %{buildroot}%{mingw32_bindir}
 
 # Drop all .la files
 find $RPM_BUILD_ROOT -name "*.la" -delete
 
 # Remove docs which duplicate those in Fedora native.
-rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc
 
 %find_lang webkit-2.0
 
@@ -201,35 +201,36 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc
 
 %postun
 if [ $1 -eq 0 ] ; then
-    /usr/bin/glib-compile-schemas %{_mingw32_datadir}/glib-2.0/schemas &> /dev/null || :
+    /usr/bin/glib-compile-schemas %{mingw32_datadir}/glib-2.0/schemas &> /dev/null || :
 fi
 
 %posttrans
-/usr/bin/glib-compile-schemas %{_mingw32_datadir}/glib-2.0/schemas &> /dev/null || :
+/usr/bin/glib-compile-schemas %{mingw32_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %files -n mingw32-webkitgtk -f webkit-2.0.lang
 %{_docdir}/%{name}-%{version}/
-%{_mingw32_bindir}/jsc-1.exe
-%{_mingw32_bindir}/GtkLauncher.exe
-%{_mingw32_bindir}/libjavascriptcoregtk-1.0-0.dll
-%{_mingw32_bindir}/libwebkitgtk-1.0-0.dll
-%{_mingw32_includedir}/webkitgtk-1.0/
-%{_mingw32_libdir}/libjavascriptcoregtk-1.0.dll.a
-%{_mingw32_libdir}/libwebkitgtk-1.0.dll.a
-%{_mingw32_libdir}/pkgconfig/javascriptcoregtk-1.0.pc
-%{_mingw32_libdir}/pkgconfig/webkit-1.0.pc
-%{_mingw32_datadir}/glib-2.0/schemas/org.webkitgtk-1.0.gschema.xml
-%{_mingw32_datadir}/webkitgtk-1.0/
+%{mingw32_bindir}/jsc-1.exe
+%{mingw32_bindir}/GtkLauncher.exe
+%{mingw32_bindir}/libjavascriptcoregtk-1.0-0.dll
+%{mingw32_bindir}/libwebkitgtk-1.0-0.dll
+%{mingw32_includedir}/webkitgtk-1.0/
+%{mingw32_libdir}/libjavascriptcoregtk-1.0.dll.a
+%{mingw32_libdir}/libwebkitgtk-1.0.dll.a
+%{mingw32_libdir}/pkgconfig/javascriptcoregtk-1.0.pc
+%{mingw32_libdir}/pkgconfig/webkit-1.0.pc
+%{mingw32_datadir}/glib-2.0/schemas/org.webkitgtk-1.0.gschema.xml
+%{mingw32_datadir}/webkitgtk-1.0/
 
 %files -n mingw32-webkitgtk-static
-%{_mingw32_libdir}/libjavascriptcoregtk-1.0.a
-%{_mingw32_libdir}/libwebkitgtk-1.0.a
+%{mingw32_libdir}/libjavascriptcoregtk-1.0.a
+%{mingw32_libdir}/libwebkitgtk-1.0.a
 
 
 %changelog
 * Tue Mar 06 2012 Kalev Lember <kalevlember at gmail.com> - 1.7.5-6
 - Renamed the source package to mingw-webkitgtk (#800452)
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Kalev Lember <kalevlember at gmail.com> - 1.7.5-5
 - Fix CFLAGS overriding with latest mingw-filesystem