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

[Kalev Lember]

commit bb2f6d912494ae6d860e8568bd343704418318a8
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Mar 6 23:15:37 2012 +0200

    Use mingw macros without leading underscore

 mingw-pthreads.spec |   55 ++++++++++++++++++++++++++-------------------------
 1 files changed, 28 insertions(+), 27 deletions(-)
---
diff --git a/mingw-pthreads.spec b/mingw-pthreads.spec
index 48df071..0384b0a 100644
--- a/mingw-pthreads.spec
+++ b/mingw-pthreads.spec
@@ -1,5 +1,5 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
+%define __strip %{mingw32_strip}
+%define __objdump %{mingw32_objdump}
 
 # The tests take ages to run and require Wine.
 %define run_tests 0
@@ -78,56 +78,57 @@ high-quality solution to this problem.
 
 
 %build
-%{_mingw32_make} clean
-%{_mingw32_make} CROSS=%{_mingw32_host}- GC-inlined
-%{_mingw32_make} clean
-%{_mingw32_make} CROSS=%{_mingw32_host}- GCE-inlined
+%{mingw32_make} clean
+%{mingw32_make} CROSS=%{mingw32_host}- GC-inlined
+%{mingw32_make} clean
+%{mingw32_make} CROSS=%{mingw32_host}- GCE-inlined
 
 
 %check
 %if %{run_tests}
 pushd tests
-%{_mingw32_make} clean
-%{_mingw32_make} QAPC= \
-  CC=%{_mingw32_cc} XXCFLAGS="-D__CLEANUP_C" TEST=GC all-pass
-%{_mingw32_make} clean
-%{_mingw32_make} QAPC= \
-  CC=%{_mingw32_cc} XXCFLAGS="-D__CLEANUP_C" TEST=GCE all-pass
+%{mingw32_make} clean
+%{mingw32_make} QAPC= \
+  CC=%{mingw32_cc} XXCFLAGS="-D__CLEANUP_C" TEST=GC all-pass
+%{mingw32_make} clean
+%{mingw32_make} QAPC= \
+  CC=%{mingw32_cc} XXCFLAGS="-D__CLEANUP_C" TEST=GCE all-pass
 popd
 %endif
 
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}
-mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}
+mkdir -p $RPM_BUILD_ROOT%{mingw32_bindir}
+mkdir -p $RPM_BUILD_ROOT%{mingw32_libdir}
+mkdir -p $RPM_BUILD_ROOT%{mingw32_includedir}
 
-install -m 0755 *.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
-install -m 0644 *.a $RPM_BUILD_ROOT%{_mingw32_libdir}
+install -m 0755 *.dll $RPM_BUILD_ROOT%{mingw32_bindir}
+install -m 0644 *.a $RPM_BUILD_ROOT%{mingw32_libdir}
 
-install -m 0644 pthread.h $RPM_BUILD_ROOT%{_mingw32_includedir}
-install -m 0644 sched.h $RPM_BUILD_ROOT%{_mingw32_includedir}
-install -m 0644 semaphore.h $RPM_BUILD_ROOT%{_mingw32_includedir}
+install -m 0644 pthread.h $RPM_BUILD_ROOT%{mingw32_includedir}
+install -m 0644 sched.h $RPM_BUILD_ROOT%{mingw32_includedir}
+install -m 0644 semaphore.h $RPM_BUILD_ROOT%{mingw32_includedir}
 
 # Create a symlink from libpthreadGC2.a to libpthread.a because of BZ #498616
-ln -s libpthreadGC2.a $RPM_BUILD_ROOT%{_mingw32_libdir}/libpthread.a
+ln -s libpthreadGC2.a $RPM_BUILD_ROOT%{mingw32_libdir}/libpthread.a
 
 
 %files -n mingw32-pthreads
 %doc ANNOUNCE BUGS ChangeLog CONTRIBUTORS COPYING COPYING.LIB
 %doc FAQ MAINTAINERS NEWS PROGRESS README README.NONPORTABLE TODO
-%{_mingw32_bindir}/pthreadGC2.dll
-%{_mingw32_bindir}/pthreadGCE2.dll
-%{_mingw32_libdir}/libpthread.a
-%{_mingw32_libdir}/libpthreadGC2.a
-%{_mingw32_libdir}/libpthreadGCE2.a
-%{_mingw32_includedir}/*.h
+%{mingw32_bindir}/pthreadGC2.dll
+%{mingw32_bindir}/pthreadGCE2.dll
+%{mingw32_libdir}/libpthread.a
+%{mingw32_libdir}/libpthreadGC2.a
+%{mingw32_libdir}/libpthreadGCE2.a
+%{mingw32_includedir}/*.h
 
 
 %changelog
 * Tue Mar 06 2012 Kalev Lember <kalevlember at gmail.com> - 2.8.0-18.20110511cvs
 - Renamed the source package to mingw-pthreads (#800414)
 - Use automatic dep extraction
+- Use mingw macros without leading underscore
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.8.0-17.20110511cvs
 - Rebuild against the mingw-w64 toolchain