[mingw-proj: 11/11] Use mingw macros without leading underscore

[Kalev Lember]

commit 26a0e9e0d9c5f40776e96e8a9c1184ba747c53ba
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 7 18:52:58 2012 +0200

    Use mingw macros without leading underscore

 mingw-proj.spec |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/mingw-proj.spec b/mingw-proj.spec
index 0e22143..6ae0891 100644
--- a/mingw-proj.spec
+++ b/mingw-proj.spec
@@ -1,5 +1,5 @@
-%global __strip %{_mingw32_strip}
-%global __objdump %{_mingw32_objdump}
+%global __strip %{mingw32_strip}
+%global __objdump %{mingw32_objdump}
 
 %global nativename proj
 
@@ -41,34 +41,35 @@ projection functions. Proj docs: http://www.remotesensing.org/dl/new_docs/
 %patch -p 1
 
 %build
-%{_mingw32_configure} --disable-static
+%{mingw32_configure} --disable-static
 make %{?_smp_mflags}
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # Remove libtool archives
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libproj.la
+rm $RPM_BUILD_ROOT%{mingw32_libdir}/libproj.la
 
 # Remove inverse program symbolic links
-rm $RPM_BUILD_ROOT%{_mingw32_bindir}/inv*.exe
+rm $RPM_BUILD_ROOT%{mingw32_bindir}/inv*.exe
 
 # Remove unneeded files
-rm -R $RPM_BUILD_ROOT%{_mingw32_datadir}/*
+rm -R $RPM_BUILD_ROOT%{mingw32_datadir}/*
 
 %check
 
 %files -n mingw32-%{nativename}
 %doc NEWS AUTHORS COPYING README ChangeLog
-%{_mingw32_bindir}/libproj-0.dll
-%{_mingw32_bindir}/*.exe
-%{_mingw32_libdir}/libproj.dll.a 
-%{_mingw32_includedir}/*.h
+%{mingw32_bindir}/libproj-0.dll
+%{mingw32_bindir}/*.exe
+%{mingw32_libdir}/libproj.dll.a
+%{mingw32_includedir}/*.h
 
 %changelog
 * Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 4.6.1-8
 - Renamed the source package to mingw-proj (#801017)
 - Modernize the spec file
+- Use mingw macros without leading underscore
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.6.1-7
 - Rebuild against the mingw-w64 toolchain