[mingw-wpcap: 22/22] Use mingw macros without leading underscore

[Kalev Lember]

commit 5d3fa507641faa78c50573272add3db29cab1f79
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 7 20:09:10 2012 +0200

    Use mingw macros without leading underscore

 mingw-wpcap.spec |   69 +++++++++++++++++++++++++++--------------------------
 1 files changed, 35 insertions(+), 34 deletions(-)
---
diff --git a/mingw-wpcap.spec b/mingw-wpcap.spec
index 1ec9408..8c898b5 100644
--- a/mingw-wpcap.spec
+++ b/mingw-wpcap.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}
 
 %global versionmajor 4
 %global versionminor 1
@@ -58,7 +58,7 @@ Requires:       mingw32-wpcap = %{version}
 %description -n mingw32-wpcap-docs
 This package contains the Windows pcap library documentation.
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 %prep
 %setup -q -n winpcap
@@ -92,28 +92,28 @@ popd
 
 
 %install
-install -d $RPM_BUILD_ROOT/%{_mingw32_bindir}
-install -d $RPM_BUILD_ROOT/%{_mingw32_libdir}/pkgconfig
-install -m0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_mingw32_libdir}/pkgconfig
-install -m0644 packetNtx/Dll/Project/libpacket.a $RPM_BUILD_ROOT/%{_mingw32_libdir}/libpacket.dll.a
-install -m0644 packetNtx/Dll/Project/Packet.dll $RPM_BUILD_ROOT/%{_mingw32_bindir}/packet.dll
-install -m0644 wpcap/lib/libwpcap.a $RPM_BUILD_ROOT/%{_mingw32_libdir}/libwpcap.dll.a
-install -m0644 wpcap/PRJ/wpcap.dll $RPM_BUILD_ROOT/%{_mingw32_bindir}
-install -m0644 packetNtx/Dll/Packet.def $RPM_BUILD_ROOT/%{_mingw32_libdir}/packet.def
-install -m0644 wpcap/PRJ/WPCAP.DEF $RPM_BUILD_ROOT/%{_mingw32_libdir}/wpcap.def
-install -d $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/pcap
-install -m0644 wpcap/libpcap/pcap/*.h $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/pcap
-install -m0644 wpcap/libpcap/pcap.h $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/
-install -m0644 wpcap/libpcap/pcap-int.h $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/
-install -m0644 wpcap/libpcap/pcap-bpf.h $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/
-install -m0644 wpcap/libpcap/pcap-namedb.h $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/
-install -m0644 wpcap/libpcap/remote-ext.h $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/
-install -m0644 wpcap/libpcap/pcap-stdinc.h $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/
-install -m0644 wpcap/Win32-Extensions/Win32-Extensions.h $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/
-install -m0644 wpcap/libpcap/Win32/Include/bittypes.h $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/
-install -m0644 wpcap/libpcap/Win32/Include/IP6_misc.h $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/
-install -m0644 wpcap/libpcap/Win32/Include/Gnuc.h $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/
-install -m0644 Common/Packet32.h $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/
+install -d $RPM_BUILD_ROOT/%{mingw32_bindir}
+install -d $RPM_BUILD_ROOT/%{mingw32_libdir}/pkgconfig
+install -m0644 %{SOURCE1} $RPM_BUILD_ROOT/%{mingw32_libdir}/pkgconfig
+install -m0644 packetNtx/Dll/Project/libpacket.a $RPM_BUILD_ROOT/%{mingw32_libdir}/libpacket.dll.a
+install -m0644 packetNtx/Dll/Project/Packet.dll $RPM_BUILD_ROOT/%{mingw32_bindir}/packet.dll
+install -m0644 wpcap/lib/libwpcap.a $RPM_BUILD_ROOT/%{mingw32_libdir}/libwpcap.dll.a
+install -m0644 wpcap/PRJ/wpcap.dll $RPM_BUILD_ROOT/%{mingw32_bindir}
+install -m0644 packetNtx/Dll/Packet.def $RPM_BUILD_ROOT/%{mingw32_libdir}/packet.def
+install -m0644 wpcap/PRJ/WPCAP.DEF $RPM_BUILD_ROOT/%{mingw32_libdir}/wpcap.def
+install -d $RPM_BUILD_ROOT/%{mingw32_includedir}/wpcap/pcap
+install -m0644 wpcap/libpcap/pcap/*.h $RPM_BUILD_ROOT/%{mingw32_includedir}/wpcap/pcap
+install -m0644 wpcap/libpcap/pcap.h $RPM_BUILD_ROOT/%{mingw32_includedir}/wpcap/
+install -m0644 wpcap/libpcap/pcap-int.h $RPM_BUILD_ROOT/%{mingw32_includedir}/wpcap/
+install -m0644 wpcap/libpcap/pcap-bpf.h $RPM_BUILD_ROOT/%{mingw32_includedir}/wpcap/
+install -m0644 wpcap/libpcap/pcap-namedb.h $RPM_BUILD_ROOT/%{mingw32_includedir}/wpcap/
+install -m0644 wpcap/libpcap/remote-ext.h $RPM_BUILD_ROOT/%{mingw32_includedir}/wpcap/
+install -m0644 wpcap/libpcap/pcap-stdinc.h $RPM_BUILD_ROOT/%{mingw32_includedir}/wpcap/
+install -m0644 wpcap/Win32-Extensions/Win32-Extensions.h $RPM_BUILD_ROOT/%{mingw32_includedir}/wpcap/
+install -m0644 wpcap/libpcap/Win32/Include/bittypes.h $RPM_BUILD_ROOT/%{mingw32_includedir}/wpcap/
+install -m0644 wpcap/libpcap/Win32/Include/IP6_misc.h $RPM_BUILD_ROOT/%{mingw32_includedir}/wpcap/
+install -m0644 wpcap/libpcap/Win32/Include/Gnuc.h $RPM_BUILD_ROOT/%{mingw32_includedir}/wpcap/
+install -m0644 Common/Packet32.h $RPM_BUILD_ROOT/%{mingw32_includedir}/wpcap/
 install -d $RPM_BUILD_ROOT/%{wpcapdoc}/html
 install -m0644 dox/WinPcap_docs.html $RPM_BUILD_ROOT/%{wpcapdoc}/
 install -m0644 dox/prj/docs/* $RPM_BUILD_ROOT/%{wpcapdoc}/html
@@ -131,14 +131,14 @@ rm -rf $RPM_BUILD_ROOT/%{wpcapexamples}/pcap/stats
 
 %files -n mingw32-wpcap
 %doc wpcap/libpcap/LICENSE
-%{_mingw32_libdir}/pkgconfig/wpcap.pc
-%{_mingw32_bindir}/packet.dll
-%{_mingw32_bindir}/wpcap.dll
-%{_mingw32_libdir}/libpacket.dll.a
-%{_mingw32_libdir}/libwpcap.dll.a
-%{_mingw32_libdir}/packet.def
-%{_mingw32_libdir}/wpcap.def
-%{_mingw32_includedir}/wpcap
+%{mingw32_libdir}/pkgconfig/wpcap.pc
+%{mingw32_bindir}/packet.dll
+%{mingw32_bindir}/wpcap.dll
+%{mingw32_libdir}/libpacket.dll.a
+%{mingw32_libdir}/libwpcap.dll.a
+%{mingw32_libdir}/packet.def
+%{mingw32_libdir}/wpcap.def
+%{mingw32_includedir}/wpcap
 
 %files -n mingw32-wpcap-docs
 %{wpcapdoc}/WinPcap_docs.html
@@ -151,6 +151,7 @@ rm -rf $RPM_BUILD_ROOT/%{wpcapexamples}/pcap/stats
 * Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 4.1.final2-6
 - Renamed the source package to mingw-wpcap (#801038)
 - Modernize the spec file
+- Use mingw macros without leading underscore
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.1.final2-5
 - Rebuild against the mingw-w64 toolchain