[mingw-openjpeg: 10/10] Use mingw macros without leading underscore

[Kalev Lember]

commit 3f90c49a1f01bbe4bf0d2be2e6f01fe2dccb1d6d
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 7 18:11:44 2012 +0200

    Use mingw macros without leading underscore

 mingw-openjpeg.spec |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)
---
diff --git a/mingw-openjpeg.spec b/mingw-openjpeg.spec
index 5750531..35d5507 100644
--- a/mingw-openjpeg.spec
+++ b/mingw-openjpeg.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}
 
 # reset patch fuzz, rebasing patches will require delicate surgery -- Rex
 %global _default_patch_fuzz 2
@@ -48,17 +48,17 @@ Patch1000: openjpeg-1.3-mingw32-cmake.patch
 
 
 %description
-%{_mingw32_description}
+%{mingw32_description}
 
 
 %package -n mingw32-openjpeg
 Summary: MinGW Windows openjpeg library
 
 %description -n mingw32-openjpeg
-%{_mingw32_description}
+%{mingw32_description}
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -90,8 +90,8 @@ chmod a-x ChangeLog license.txt
 %build
 mkdir build
 pushd build
-export MINGW32_CFLAGS="%{_mingw32_cflags} -DWIN32"
-%{_mingw32_cmake} ..
+export MINGW32_CFLAGS="%{mingw32_cflags} -DWIN32"
+%{mingw32_cmake} ..
 make %{?_smp_mflags}
 popd
 
@@ -99,13 +99,13 @@ popd
 %install
 pushd build
 make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
-mv $RPM_BUILD_ROOT%{_mingw32_libdir}/libopenjpeg.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
+mkdir -p $RPM_BUILD_ROOT%{mingw32_bindir}
+mv $RPM_BUILD_ROOT%{mingw32_libdir}/libopenjpeg.dll $RPM_BUILD_ROOT%{mingw32_bindir}
 popd
 
 # HACK: until pkg-config support lands, temporarily provide
 # openjpeg.h header in legacy location
-ln -s openjpeg/openjpeg.h $RPM_BUILD_ROOT%{_mingw32_includedir}/openjpeg.h
+ln -s openjpeg/openjpeg.h $RPM_BUILD_ROOT%{mingw32_includedir}/openjpeg.h
 
 
 %check
@@ -115,16 +115,17 @@ make test -C build
 
 %files -n mingw32-openjpeg
 %doc license.txt
-%{_mingw32_includedir}/openjpeg.h
-%{_mingw32_includedir}/openjpeg
-%{_mingw32_bindir}/libopenjpeg.dll
-%{_mingw32_libdir}/libopenjpeg.dll.a
+%{mingw32_includedir}/openjpeg.h
+%{mingw32_includedir}/openjpeg
+%{mingw32_bindir}/libopenjpeg.dll
+%{mingw32_libdir}/libopenjpeg.dll.a
 
 
 %changelog
 * Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 1.3-9
 - Renamed the source package to mingw-openjpeg (#801008)
 - Modernize the spec file
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.3-8
 - Rebuild against the mingw-w64 toolchain