[mingw-gnutls: 22/23] Use mingw macros without leading underscore

[epienbro]

commit 0cf813fefd8aa9942efacbf8c7b4cad2ec1c04b3
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Mar 7 18:20:20 2012 +0100

    Use mingw macros without leading underscore

 mingw-gnutls.spec |   71 +++++++++++++++++++++++++++--------------------------
 1 files changed, 36 insertions(+), 35 deletions(-)
---
diff --git a/mingw-gnutls.spec b/mingw-gnutls.spec
index e4fb937..67dce6e 100644
--- a/mingw-gnutls.spec
+++ b/mingw-gnutls.spec
@@ -1,9 +1,9 @@
-%global __strip %{_mingw32_strip}
-%global __objdump %{_mingw32_objdump}
+%global __strip %{mingw32_strip}
+%global __objdump %{mingw32_objdump}
 %global _use_internal_dependency_generator 0
-%global __find_requires %{_mingw32_findrequires}
-%global __find_provides %{_mingw32_findprovides}
-%define __debug_install_post %{_mingw32_debug_install_post}
+%global __find_requires %{mingw32_findrequires}
+%global __find_provides %{mingw32_findprovides}
+%define __debug_install_post %{mingw32_debug_install_post}
 
 Name:           mingw-gnutls
 Version:        2.12.14
@@ -69,7 +69,7 @@ GnuTLS TLS/SSL encryption library.  This library is cross-compiled
 for MinGW.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -94,8 +94,8 @@ autoreconf
 
 
 %build
-PATH="%{_mingw32_bindir}:$PATH" \
-%{_mingw32_configure} \
+PATH="%{mingw32_bindir}:$PATH" \
+%{mingw32_configure} \
   --with-libgcrypt \
   --with-included-libtasn1 \
   --disable-srp-authentication \
@@ -109,11 +109,11 @@ cp lib/COPYING COPYING.LIB
 rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT%{_mingw32_datadir}/info/dir
+rm -f $RPM_BUILD_ROOT%{mingw32_datadir}/info/dir
 
 # Remove info and man pages which duplicate stuff in Fedora already.
-rm -rf $RPM_BUILD_ROOT%{_mingw32_infodir}
-rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
+rm -rf $RPM_BUILD_ROOT%{mingw32_infodir}
+rm -rf $RPM_BUILD_ROOT%{mingw32_mandir}
 
 %find_lang libgnutls
 
@@ -125,35 +125,36 @@ rm -rf $RPM_BUILD_ROOT
 %files -n mingw32-gnutls -f libgnutls.lang
 %defattr(-,root,root)
 %doc COPYING COPYING.LIB
-%{_mingw32_bindir}/certtool.exe
-%{_mingw32_bindir}/gnutls-cli-debug.exe
-%{_mingw32_bindir}/gnutls-cli.exe
-%{_mingw32_bindir}/gnutls-serv.exe
-%{_mingw32_bindir}/libgnutls-26.def
-%{_mingw32_bindir}/libgnutls-26.dll
-%{_mingw32_bindir}/libgnutls-extra-26.def
-%{_mingw32_bindir}/libgnutls-extra-26.dll
-%{_mingw32_bindir}/libgnutls-openssl-26.def
-%{_mingw32_bindir}/libgnutls-openssl-27.dll
-%{_mingw32_bindir}/libgnutlsxx-27.dll
-%{_mingw32_bindir}/p11tool.exe
-%{_mingw32_bindir}/psktool.exe
-%{_mingw32_libdir}/libgnutls-extra.dll.a
-%{_mingw32_libdir}/libgnutls-extra.la
-%{_mingw32_libdir}/libgnutls-openssl.dll.a
-%{_mingw32_libdir}/libgnutls-openssl.la
-%{_mingw32_libdir}/libgnutls.dll.a
-%{_mingw32_libdir}/libgnutls.la
-%{_mingw32_libdir}/libgnutlsxx.dll.a
-%{_mingw32_libdir}/libgnutlsxx.la
-%{_mingw32_libdir}/pkgconfig/gnutls-extra.pc
-%{_mingw32_libdir}/pkgconfig/gnutls.pc
-%{_mingw32_includedir}/gnutls/
+%{mingw32_bindir}/certtool.exe
+%{mingw32_bindir}/gnutls-cli-debug.exe
+%{mingw32_bindir}/gnutls-cli.exe
+%{mingw32_bindir}/gnutls-serv.exe
+%{mingw32_bindir}/libgnutls-26.def
+%{mingw32_bindir}/libgnutls-26.dll
+%{mingw32_bindir}/libgnutls-extra-26.def
+%{mingw32_bindir}/libgnutls-extra-26.dll
+%{mingw32_bindir}/libgnutls-openssl-26.def
+%{mingw32_bindir}/libgnutls-openssl-27.dll
+%{mingw32_bindir}/libgnutlsxx-27.dll
+%{mingw32_bindir}/p11tool.exe
+%{mingw32_bindir}/psktool.exe
+%{mingw32_libdir}/libgnutls-extra.dll.a
+%{mingw32_libdir}/libgnutls-extra.la
+%{mingw32_libdir}/libgnutls-openssl.dll.a
+%{mingw32_libdir}/libgnutls-openssl.la
+%{mingw32_libdir}/libgnutls.dll.a
+%{mingw32_libdir}/libgnutls.la
+%{mingw32_libdir}/libgnutlsxx.dll.a
+%{mingw32_libdir}/libgnutlsxx.la
+%{mingw32_libdir}/pkgconfig/gnutls-extra.pc
+%{mingw32_libdir}/pkgconfig/gnutls.pc
+%{mingw32_includedir}/gnutls/
 
 
 %changelog
 * Wed Mar 07 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.12.14-5
 - Renamed the source package to mingw-gnutls (RHBZ #800878)
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.12.14-4
 - Rebuild against the mingw-w64 toolchain