[mingw-libgnurx: 15/15] Use mingw macros without leading underscore

[Kalev Lember]

commit f8b28ec583cae1f0d14b0b7db668adae62a0623e
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Mar 6 21:17:01 2012 +0200

    Use mingw macros without leading underscore

 mingw-libgnurx.spec |   35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 deletions(-)
---
diff --git a/mingw-libgnurx.spec b/mingw-libgnurx.spec
index 7011ead..d4b969d 100644
--- a/mingw-libgnurx.spec
+++ b/mingw-libgnurx.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-libgnurx
 Version:        2.5.1
@@ -42,7 +42,7 @@ Group:          Development/Libraries
 Static version of the MinGW Windows regular expression library.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -62,43 +62,44 @@ autoconf
 automake --add-missing
 
 %build
-%{_mingw32_configure} --enable-static --enable-shared
+%{mingw32_configure} --enable-static --enable-shared
 make %{?_smp_mflags}
 
 
 %install
-# make install expects %{_mingw32_includedir} to exist
-mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}
+# make install expects %{mingw32_includedir} to exist
+mkdir -p $RPM_BUILD_ROOT%{mingw32_includedir}
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # make install installs two import libraries named libgnurx.a and
 # libgnurx.dll.a. As most applications requiring regex functions
 # try to perform 'gcc -lregex' we rename the import libraries for this to work
-mv $RPM_BUILD_ROOT%{_mingw32_libdir}/libgnurx.a $RPM_BUILD_ROOT%{_mingw32_libdir}/libregex.a
-mv $RPM_BUILD_ROOT%{_mingw32_libdir}/libgnurx.dll.a $RPM_BUILD_ROOT%{_mingw32_libdir}/libregex.dll.a
-mv $RPM_BUILD_ROOT%{_mingw32_libdir}/libgnurx.la $RPM_BUILD_ROOT%{_mingw32_libdir}/libregex.la
-sed -i s/gnurx/regex/ $RPM_BUILD_ROOT%{_mingw32_libdir}/libregex.la
+mv $RPM_BUILD_ROOT%{mingw32_libdir}/libgnurx.a $RPM_BUILD_ROOT%{mingw32_libdir}/libregex.a
+mv $RPM_BUILD_ROOT%{mingw32_libdir}/libgnurx.dll.a $RPM_BUILD_ROOT%{mingw32_libdir}/libregex.dll.a
+mv $RPM_BUILD_ROOT%{mingw32_libdir}/libgnurx.la $RPM_BUILD_ROOT%{mingw32_libdir}/libregex.la
+sed -i s/gnurx/regex/ $RPM_BUILD_ROOT%{mingw32_libdir}/libregex.la
 
 # Drop the man pages
-rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/man
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/man
 
 
 %files -n mingw32-libgnurx
 %doc COPYING.LIB
-%{_mingw32_bindir}/libgnurx-0.dll
-%{_mingw32_includedir}/regex.h
-%{_mingw32_libdir}/libregex.dll.a
-%{_mingw32_libdir}/libregex.la
+%{mingw32_bindir}/libgnurx-0.dll
+%{mingw32_includedir}/regex.h
+%{mingw32_libdir}/libregex.dll.a
+%{mingw32_libdir}/libregex.la
 
 %files -n mingw32-libgnurx-static
-%{_mingw32_libdir}/libregex.a
+%{mingw32_libdir}/libregex.a
 
 
 %changelog
 * Tue Mar 06 2012 Kalev Lember <kalevlember at gmail.com> - 2.5.1-10
 - Renamed the source package to mingw-libgnurx (#800429)
 - Spec clean up
+- Use mingw macros without leading underscore
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.5.1-9
 - Rebuild against the mingw-w64 toolchain