[mingw-gdbm: 14/16] Use mingw macros without leading underscore

[epienbro]

commit d18c98e2cfd18db708aa9985932387a69b4baebd
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Mar 7 18:06:38 2012 +0100

    Use mingw macros without leading underscore

 mingw-gdbm.spec |   47 ++++++++++++++++++++++++-----------------------
 1 files changed, 24 insertions(+), 23 deletions(-)
---
diff --git a/mingw-gdbm.spec b/mingw-gdbm.spec
index 3ebcc8e..b0b81b8 100644
--- a/mingw-gdbm.spec
+++ b/mingw-gdbm.spec
@@ -1,8 +1,8 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
+%define __strip %{mingw32_strip}
+%define __objdump %{mingw32_objdump}
 %define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%define __find_requires %{mingw32_findrequires}
+%define __find_provides %{mingw32_findprovides}
 
 Name:           mingw-gdbm
 Version:        1.8.0
@@ -81,34 +81,34 @@ automake --add-missing ||:
 
 autoconf
 
-%{_mingw32_configure}
+%{mingw32_configure}
 # NB: %{?_smp_mflags} causes build to fail.
-make libdir=%{_mingw32_libdir} all progs
+make libdir=%{mingw32_libdir} all progs
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT%{_mingw32_prefix} install
+make prefix=$RPM_BUILD_ROOT%{mingw32_prefix} install
 
 # Install the binaries.  Arguable whether we really want these.
 install conv2gdbm.exe tdbm.exe testdbm.exe testgdbm.exe testndbm.exe tndbm.exe \
-  $RPM_BUILD_ROOT%{_mingw32_bindir}
+  $RPM_BUILD_ROOT%{mingw32_bindir}
 
 # Native Fedora package seems to fluff this, but as far as I
 # can tell they are trying to create <gdbm/gdbm.h> which
 # links to <gdbm.h>.
-pushd $RPM_BUILD_ROOT%{_mingw32_includedir}
+pushd $RPM_BUILD_ROOT%{mingw32_includedir}
 mkdir gdbm
 cd gdbm
 ln -s ../gdbm.h
 popd
 
 # Remove the static library.
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libgdbm.a
+rm $RPM_BUILD_ROOT%{mingw32_libdir}/libgdbm.a
 
 # Remove man page and info file which duplicate what is in native package.
-rm -r $RPM_BUILD_ROOT%{_mingw32_prefix}/man
-rm -r $RPM_BUILD_ROOT%{_mingw32_prefix}/info
+rm -r $RPM_BUILD_ROOT%{mingw32_prefix}/man
+rm -r $RPM_BUILD_ROOT%{mingw32_prefix}/info
 
 
 %clean
@@ -117,22 +117,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n mingw32-gdbm
 %defattr(-,root,root)
-%{_mingw32_bindir}/conv2gdbm.exe
-%{_mingw32_bindir}/tdbm.exe
-%{_mingw32_bindir}/testdbm.exe
-%{_mingw32_bindir}/testgdbm.exe
-%{_mingw32_bindir}/testndbm.exe
-%{_mingw32_bindir}/tndbm.exe
-%{_mingw32_bindir}/libgdbm-2.dll
-%{_mingw32_libdir}/libgdbm.dll.a
-%{_mingw32_libdir}/libgdbm.la
-%{_mingw32_includedir}/gdbm.h
-%{_mingw32_includedir}/gdbm
+%{mingw32_bindir}/conv2gdbm.exe
+%{mingw32_bindir}/tdbm.exe
+%{mingw32_bindir}/testdbm.exe
+%{mingw32_bindir}/testgdbm.exe
+%{mingw32_bindir}/testndbm.exe
+%{mingw32_bindir}/tndbm.exe
+%{mingw32_bindir}/libgdbm-2.dll
+%{mingw32_libdir}/libgdbm.dll.a
+%{mingw32_libdir}/libgdbm.la
+%{mingw32_includedir}/gdbm.h
+%{mingw32_includedir}/gdbm
 
 
 %changelog
 * Wed Mar 07 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.8.0-9
 - Renamed the source package to mingw-gdbm (RHBZ #800874)
+- Use mingw macros without leading underscore
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.8.0-8
 - Rebuild against the mingw-w64 toolchain