[mingw-gtkhtml3: 20/20] Use mingw macros without leading underscore

[epienbro]

commit 915f9441b12ce5eeeb447bcafbe12ae9cab28e88
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Tue Mar 6 21:03:45 2012 +0100

    Use mingw macros without leading underscore

 mingw-gtkhtml3.spec |   45 +++++++++++++++++++++++----------------------
 1 files changed, 23 insertions(+), 22 deletions(-)
---
diff --git a/mingw-gtkhtml3.spec b/mingw-gtkhtml3.spec
index 4c839c2..22e988c 100644
--- a/mingw-gtkhtml3.spec
+++ b/mingw-gtkhtml3.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-gtkhtml3
 Version:        3.32.2
@@ -79,7 +79,7 @@ Group:          Development/Libraries
 Static version of the MinGW Windows GtkHTML library.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -99,13 +99,13 @@ autoreconf --install --force
 # build GtkHTML twice here
 mkdir build_static
 pushd build_static
-    %{_mingw32_configure} --disable-deprecated-warning-flags --enable-static --disable-shared CFLAGS="$CFLAGS -DGLIB_STATIC_COMPILATION -DGOBJECT_STATIC_COMPILATION"
+    %{mingw32_configure} --disable-deprecated-warning-flags --enable-static --disable-shared CFLAGS="$CFLAGS -DGLIB_STATIC_COMPILATION -DGOBJECT_STATIC_COMPILATION"
     make %{?_smp_mflags}
 popd
 
 mkdir build_shared
 pushd build_shared
-    %{_mingw32_configure} --disable-deprecated-warning-flags --disable-static --enable-shared
+    %{mingw32_configure} --disable-deprecated-warning-flags --disable-static --enable-shared
     make %{?_smp_mflags}
 popd
 
@@ -117,11 +117,11 @@ make -C build_shared DESTDIR=$RPM_BUILD_ROOT install
 # Install all the files from the static build in a seperate folder
 # and move the static libraries to the right location
 make -C build_static DESTDIR=$RPM_BUILD_ROOT/build_static install
-mv $RPM_BUILD_ROOT/build_static%{_mingw32_libdir}/*.a $RPM_BUILD_ROOT%{_mingw32_libdir}
+mv $RPM_BUILD_ROOT/build_static%{mingw32_libdir}/*.a $RPM_BUILD_ROOT%{mingw32_libdir}
 
 # Manually merge the libtool files
-sed -i s/"old_library=''"/"old_library='libgtkhtml-3.14.a'"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libgtkhtml-3.14.la
-sed -i s/"old_library=''"/"old_library='libgtkhtml-editor-3.14.a'"/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libgtkhtml-editor-3.14.la
+sed -i s/"old_library=''"/"old_library='libgtkhtml-3.14.a'"/ $RPM_BUILD_ROOT%{mingw32_libdir}/libgtkhtml-3.14.la
+sed -i s/"old_library=''"/"old_library='libgtkhtml-editor-3.14.a'"/ $RPM_BUILD_ROOT%{mingw32_libdir}/libgtkhtml-editor-3.14.la
 
 # Drop the folder which was temporary used for installing the static bits
 rm -rf $RPM_BUILD_ROOT/build_static
@@ -130,32 +130,33 @@ rm -rf $RPM_BUILD_ROOT/build_static
 find $RPM_BUILD_ROOT -name "*.la" -delete
 
 # Install a small test program
-install -m0755 build_shared/gtkhtml/.libs/testgtkhtml.exe $RPM_BUILD_ROOT%{_mingw32_bindir}/testgtkhtml.exe
+install -m0755 build_shared/gtkhtml/.libs/testgtkhtml.exe $RPM_BUILD_ROOT%{mingw32_bindir}/testgtkhtml.exe
 
 %find_lang gtkhtml-3.14
 
 
 %files -n mingw32-gtkhtml3 -f gtkhtml-3.14.lang
 %doc COPYING.LIB
-%{_mingw32_bindir}/gtkhtml-editor-test.exe
-%{_mingw32_bindir}/libgtkhtml-3.14-19.dll
-%{_mingw32_bindir}/libgtkhtml-editor-3.14-0.dll
-%{_mingw32_bindir}/testgtkhtml.exe
-%{_mingw32_includedir}/libgtkhtml-3.14
-%{_mingw32_libdir}/libgtkhtml-3.14.dll.a
-%{_mingw32_libdir}/libgtkhtml-editor-3.14.dll.a
-%{_mingw32_libdir}/pkgconfig/libgtkhtml-3.14.pc
-%{_mingw32_libdir}/pkgconfig/gtkhtml-editor-3.14.pc
-%{_mingw32_datadir}/gtkhtml-3.14
+%{mingw32_bindir}/gtkhtml-editor-test.exe
+%{mingw32_bindir}/libgtkhtml-3.14-19.dll
+%{mingw32_bindir}/libgtkhtml-editor-3.14-0.dll
+%{mingw32_bindir}/testgtkhtml.exe
+%{mingw32_includedir}/libgtkhtml-3.14
+%{mingw32_libdir}/libgtkhtml-3.14.dll.a
+%{mingw32_libdir}/libgtkhtml-editor-3.14.dll.a
+%{mingw32_libdir}/pkgconfig/libgtkhtml-3.14.pc
+%{mingw32_libdir}/pkgconfig/gtkhtml-editor-3.14.pc
+%{mingw32_datadir}/gtkhtml-3.14
 
 %files -n mingw32-gtkhtml3-static
-%{_mingw32_libdir}/libgtkhtml-3.14.a
-%{_mingw32_libdir}/libgtkhtml-editor-3.14.a
+%{mingw32_libdir}/libgtkhtml-3.14.a
+%{mingw32_libdir}/libgtkhtml-editor-3.14.a
 
 
 %changelog
 * Tue Mar 06 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.32.2-6
 - Renamed the source package to mingw-gtkhtml3 (RHBZ #800393)
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.32.2-5
 - Rebuild against the mingw-w64 toolchain