[mingw-qpid-cpp: 28/28] Use mingw macros without leading underscore

[Kalev Lember]

commit 3164a1c210ced4d60624442d23babf4eb02f7c6f
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 7 19:06:31 2012 +0200

    Use mingw macros without leading underscore

 mingw-qpid-cpp.spec |   73 ++++++++++++++++++++++++++-------------------------
 1 files changed, 37 insertions(+), 36 deletions(-)
---
diff --git a/mingw-qpid-cpp.spec b/mingw-qpid-cpp.spec
index 3e4a4f5..0310d7e 100644
--- a/mingw-qpid-cpp.spec
+++ b/mingw-qpid-cpp.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-qpid-cpp
 Version:	0.14
@@ -49,7 +49,7 @@ applications developed using Qpid C++. Clients exchange messages with
 an AMQP message broker using the AMQP protocol.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 %prep
 %setup -q -n qpid-%{version}
@@ -72,7 +72,7 @@ sed -i s/'-Wcast-qual'/'-Wno-error=delete-non-virtual-dtor -Wno-error=narrowing
 %build
 %{__mkdir_p} build
 pushd build
-%_mingw32_cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+%mingw32_cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DBUILD_MSCLFS:BOOL=OFF		  \
 		-DBUILD_MSSQL:BOOL=OFF		  \
 		-DBUILD_SSL:BOOL=OFF		  \
@@ -86,54 +86,55 @@ make -C build VERBOSE=1 %{?_smp_mflags}
 DESTDIR=$RPM_BUILD_ROOT make -C build VERBOSE=1 install
 
 # Don't package sources in the examples directory
-rm -rf $RPM_BUILD_ROOT%{_mingw32_prefix}/examples
-rm -rf $RPM_BUILD_ROOT%{_mingw32_prefix}/bin/qpid-latency-test.exe
-rm -rf $RPM_BUILD_ROOT%{_mingw32_prefix}/bin/qpid-perftest.exe
+rm -rf $RPM_BUILD_ROOT%{mingw32_prefix}/examples
+rm -rf $RPM_BUILD_ROOT%{mingw32_prefix}/bin/qpid-latency-test.exe
+rm -rf $RPM_BUILD_ROOT%{mingw32_prefix}/bin/qpid-perftest.exe
 
 # Drop a man-page which is duplicate with the native qpid-cpp package
 # and which is installed to the wrong folder anyway
 rm -f $RPM_BUILD_ROOT/man1/qpidd.1 || :
 
 # Move the import libraries to the libdir
-mkdir $RPM_BUILD_ROOT%{_mingw32_libdir}
-mv $RPM_BUILD_ROOT%{_mingw32_bindir}/*.a $RPM_BUILD_ROOT%{_mingw32_libdir}
+mkdir $RPM_BUILD_ROOT%{mingw32_libdir}
+mv $RPM_BUILD_ROOT%{mingw32_bindir}/*.a $RPM_BUILD_ROOT%{mingw32_libdir}
 
 # Maybe install some test programs for validation
 #{__install} -d $RPM_BUILD_ROOT $RPM_BUILD_ROOT{_mingw32_bindir}
 
 %files -n mingw32-qpid-cpp
-%doc %{_mingw32_prefix}/LICENSE
-%doc %{_mingw32_prefix}/NOTICE
+%doc %{mingw32_prefix}/LICENSE
+%doc %{mingw32_prefix}/NOTICE
 %doc cpp/RELEASE_NOTES
-%{_mingw32_prefix}/conf
-%{_mingw32_prefix}/plugins
-%{_mingw32_prefix}/managementgen
-%{_mingw32_includedir}/qpid
-%{_mingw32_includedir}/qmf
-%{_mingw32_bindir}/qpidd.exe
-%{_mingw32_bindir}/libqmf.dll
-%{_mingw32_bindir}/libqmf2.dll
-%{_mingw32_bindir}/libqmfconsole.dll
-%{_mingw32_bindir}/libqmfengine.dll
-%{_mingw32_bindir}/libqpidbroker.dll
-%{_mingw32_bindir}/libqpidclient.dll
-%{_mingw32_bindir}/libqpidcommon.dll
-%{_mingw32_bindir}/libqpidmessaging.dll
-%{_mingw32_bindir}/libqpidtypes.dll
-%{_mingw32_libdir}/libqmf.dll.a
-%{_mingw32_libdir}/libqmf2.dll.a
-%{_mingw32_libdir}/libqmfconsole.dll.a
-%{_mingw32_libdir}/libqmfengine.dll.a
-%{_mingw32_libdir}/libqpidbroker.dll.a
-%{_mingw32_libdir}/libqpidclient.dll.a
-%{_mingw32_libdir}/libqpidcommon.dll.a
-%{_mingw32_libdir}/libqpidmessaging.dll.a
-%{_mingw32_libdir}/libqpidtypes.dll.a
+%{mingw32_prefix}/conf
+%{mingw32_prefix}/plugins
+%{mingw32_prefix}/managementgen
+%{mingw32_includedir}/qpid
+%{mingw32_includedir}/qmf
+%{mingw32_bindir}/qpidd.exe
+%{mingw32_bindir}/libqmf.dll
+%{mingw32_bindir}/libqmf2.dll
+%{mingw32_bindir}/libqmfconsole.dll
+%{mingw32_bindir}/libqmfengine.dll
+%{mingw32_bindir}/libqpidbroker.dll
+%{mingw32_bindir}/libqpidclient.dll
+%{mingw32_bindir}/libqpidcommon.dll
+%{mingw32_bindir}/libqpidmessaging.dll
+%{mingw32_bindir}/libqpidtypes.dll
+%{mingw32_libdir}/libqmf.dll.a
+%{mingw32_libdir}/libqmf2.dll.a
+%{mingw32_libdir}/libqmfconsole.dll.a
+%{mingw32_libdir}/libqmfengine.dll.a
+%{mingw32_libdir}/libqpidbroker.dll.a
+%{mingw32_libdir}/libqpidclient.dll.a
+%{mingw32_libdir}/libqpidcommon.dll.a
+%{mingw32_libdir}/libqpidmessaging.dll.a
+%{mingw32_libdir}/libqpidtypes.dll.a
 
 %changelog
 * Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 0.14-2
 - Renamed the source package to mingw-qpid-cpp (#801018)
 - Modernize the spec file
+- Use mingw macros without leading underscore
 
 * Sun Feb 26 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.14-1
 - Update to 0.14