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

[Kalev Lember]

commit 444bed79342573de7ac573f396c8fa549c26228b
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 7 17:33:10 2012 +0200

    Use mingw macros without leading underscore

 mingw-libvirt.spec |  115 ++++++++++++++++++++++++++--------------------------
 1 files changed, 58 insertions(+), 57 deletions(-)
---
diff --git a/mingw-libvirt.spec b/mingw-libvirt.spec
index 70e9051..ec5e8da 100644
--- a/mingw-libvirt.spec
+++ b/mingw-libvirt.spec
@@ -1,6 +1,6 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define __debug_install_post %{_mingw32_debug_install_post}
+%define __strip %{mingw32_strip}
+%define __objdump %{mingw32_objdump}
+%define __debug_install_post %{mingw32_debug_install_post}
 
 # Default to skipping autoreconf.  Distros can change just this one line
 # (or provide a command-line override) if they backport any patches that
@@ -68,7 +68,7 @@ BuildRequires: mingw32-curl
 
 BuildArch:      noarch
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 %description
 MinGW Windows libvirt virtualization library.
@@ -107,7 +107,7 @@ MinGW Windows libvirt virtualization library.
 autoreconf -if
 %endif
 # XXX enable SASL in future
-%{_mingw32_configure} \
+%{mingw32_configure} \
   --without-xen \
   --without-qemu \
   --without-openvz \
@@ -133,68 +133,69 @@ make
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
 
-rm -rf $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/libvirt/nwfilter
-rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/doc/*
-rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc/*
+rm -rf $RPM_BUILD_ROOT%{mingw32_sysconfdir}/libvirt/nwfilter
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/doc/*
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc/*
 
-rm -rf $RPM_BUILD_ROOT%{_mingw32_libexecdir}/libvirt_iohelper.exe
+rm -rf $RPM_BUILD_ROOT%{mingw32_libexecdir}/libvirt_iohelper.exe
 
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libvirt.a
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libvirt-qemu.a
+rm $RPM_BUILD_ROOT%{mingw32_libdir}/libvirt.a
+rm $RPM_BUILD_ROOT%{mingw32_libdir}/libvirt-qemu.a
 
 
 %files -n mingw32-libvirt
-%dir %{_mingw32_sysconfdir}/libvirt/
-%config(noreplace) %{_mingw32_sysconfdir}/libvirt/libvirt.conf
-
-%{_mingw32_bindir}/libvirt-0.dll
-%{_mingw32_bindir}/virsh.exe
-%{_mingw32_bindir}/virt-xml-validate
-%{_mingw32_bindir}/virt-pki-validate
-%{_mingw32_bindir}/virt-host-validate.exe
-%{_mingw32_bindir}/libvirt-qemu-0.dll
-
-%{_mingw32_libdir}/libvirt.dll.a
-%{_mingw32_libdir}/libvirt.la
-%{_mingw32_libdir}/pkgconfig/libvirt.pc
-%{_mingw32_libdir}/libvirt-qemu.dll.a
-%{_mingw32_libdir}/libvirt-qemu.la
-
-%dir %{_mingw32_datadir}/libvirt/
-%dir %{_mingw32_datadir}/libvirt/schemas/
-%{_mingw32_datadir}/libvirt/schemas/basictypes.rng
-%{_mingw32_datadir}/libvirt/schemas/capability.rng
-%{_mingw32_datadir}/libvirt/schemas/domain.rng
-%{_mingw32_datadir}/libvirt/schemas/domaincommon.rng
-%{_mingw32_datadir}/libvirt/schemas/domainsnapshot.rng
-%{_mingw32_datadir}/libvirt/schemas/interface.rng
-%{_mingw32_datadir}/libvirt/schemas/network.rng
-%{_mingw32_datadir}/libvirt/schemas/networkcommon.rng
-%{_mingw32_datadir}/libvirt/schemas/nodedev.rng
-%{_mingw32_datadir}/libvirt/schemas/nwfilter.rng
-%{_mingw32_datadir}/libvirt/schemas/secret.rng
-%{_mingw32_datadir}/libvirt/schemas/storageencryption.rng
-%{_mingw32_datadir}/libvirt/schemas/storagepool.rng
-%{_mingw32_datadir}/libvirt/schemas/storagevol.rng
-
-%{_mingw32_datadir}/libvirt/cpu_map.xml
-
-%{_mingw32_datadir}/locale/*/LC_MESSAGES/libvirt.mo
-
-%dir %{_mingw32_includedir}/libvirt
-%{_mingw32_includedir}/libvirt/libvirt.h
-%{_mingw32_includedir}/libvirt/virterror.h
-%{_mingw32_includedir}/libvirt/libvirt-qemu.h
-
-%{_mingw32_mandir}/man1/virsh.1*
-%{_mingw32_mandir}/man1/virt-xml-validate.1*
-%{_mingw32_mandir}/man1/virt-pki-validate.1*
-%{_mingw32_mandir}/man1/virt-host-validate.1*
+%dir %{mingw32_sysconfdir}/libvirt/
+%config(noreplace) %{mingw32_sysconfdir}/libvirt/libvirt.conf
+
+%{mingw32_bindir}/libvirt-0.dll
+%{mingw32_bindir}/virsh.exe
+%{mingw32_bindir}/virt-xml-validate
+%{mingw32_bindir}/virt-pki-validate
+%{mingw32_bindir}/virt-host-validate.exe
+%{mingw32_bindir}/libvirt-qemu-0.dll
+
+%{mingw32_libdir}/libvirt.dll.a
+%{mingw32_libdir}/libvirt.la
+%{mingw32_libdir}/pkgconfig/libvirt.pc
+%{mingw32_libdir}/libvirt-qemu.dll.a
+%{mingw32_libdir}/libvirt-qemu.la
+
+%dir %{mingw32_datadir}/libvirt/
+%dir %{mingw32_datadir}/libvirt/schemas/
+%{mingw32_datadir}/libvirt/schemas/basictypes.rng
+%{mingw32_datadir}/libvirt/schemas/capability.rng
+%{mingw32_datadir}/libvirt/schemas/domain.rng
+%{mingw32_datadir}/libvirt/schemas/domaincommon.rng
+%{mingw32_datadir}/libvirt/schemas/domainsnapshot.rng
+%{mingw32_datadir}/libvirt/schemas/interface.rng
+%{mingw32_datadir}/libvirt/schemas/network.rng
+%{mingw32_datadir}/libvirt/schemas/networkcommon.rng
+%{mingw32_datadir}/libvirt/schemas/nodedev.rng
+%{mingw32_datadir}/libvirt/schemas/nwfilter.rng
+%{mingw32_datadir}/libvirt/schemas/secret.rng
+%{mingw32_datadir}/libvirt/schemas/storageencryption.rng
+%{mingw32_datadir}/libvirt/schemas/storagepool.rng
+%{mingw32_datadir}/libvirt/schemas/storagevol.rng
+
+%{mingw32_datadir}/libvirt/cpu_map.xml
+
+%{mingw32_datadir}/locale/*/LC_MESSAGES/libvirt.mo
+
+%dir %{mingw32_includedir}/libvirt
+%{mingw32_includedir}/libvirt/libvirt.h
+%{mingw32_includedir}/libvirt/virterror.h
+%{mingw32_includedir}/libvirt/libvirt-qemu.h
+
+%{mingw32_mandir}/man1/virsh.1*
+%{mingw32_mandir}/man1/virt-xml-validate.1*
+%{mingw32_mandir}/man1/virt-pki-validate.1*
+%{mingw32_mandir}/man1/virt-host-validate.1*
 
 
 %changelog
 * Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 0.9.10-3
 - Renamed the source package to mingw-libvirt (#800924)
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.9.10-2
 - Rebuild against the mingw-w64 toolchain