[mingw-dbus: 11/12] Use mingw macros without leading underscore

[epienbro]

commit 4e357d950447e1fc7263781129454d4793a49909
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Mar 7 17:29:09 2012 +0100

    Use mingw macros without leading underscore

 mingw-dbus.spec |   43 ++++++++++++++++++++++---------------------
 1 files changed, 22 insertions(+), 21 deletions(-)
---
diff --git a/mingw-dbus.spec b/mingw-dbus.spec
index 12f0bc4..ccdbe5a 100644
--- a/mingw-dbus.spec
+++ b/mingw-dbus.spec
@@ -1,9 +1,9 @@
-%global __strip %{_mingw32_strip}
-%global __objdump %{_mingw32_objdump}
+%global __strip %{mingw32_strip}
+%global __objdump %{mingw32_objdump}
 %global _use_internal_dependency_generator 0
-%global __find_requires %{_mingw32_findrequires}
-%global __find_provides %{_mingw32_findprovides}
-%define __debug_install_post %{_mingw32_debug_install_post}
+%global __find_requires %{mingw32_findrequires}
+%global __find_provides %{mingw32_findprovides}
+%define __debug_install_post %{mingw32_debug_install_post}
 
 Name:           mingw-dbus
 Version:        1.4.6
@@ -58,7 +58,7 @@ per-user-login-session messaging facility.
 
 Static version of MinGW Windows port of DBus library
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 %prep
 %setup -q -n dbus-%{version}
@@ -66,7 +66,7 @@ Static version of MinGW Windows port of DBus library
 %patch1 -p0
 
 %build
-%{_mingw32_configure}
+%{mingw32_configure}
 make %{?_smp_mflags}
 
 %install
@@ -74,33 +74,34 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 # Remove manpages because they duplicate what's in the
 # Fedora native package already.
-rm -r $RPM_BUILD_ROOT%{_mingw32_mandir}/man1
+rm -r $RPM_BUILD_ROOT%{mingw32_mandir}/man1
 
 # The init.d script is unneeded for Win32 environments so it can be dropped
-rm -r $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/rc.d/init.d/messagebus
+rm -r $RPM_BUILD_ROOT%{mingw32_sysconfdir}/rc.d/init.d/messagebus
 
 %files -n mingw32-dbus
 %defattr(-,root,root,-)
 %doc COPYING
-%{_mingw32_bindir}/dbus-daemon.exe
-%{_mingw32_bindir}/dbus-launch.exe
-%{_mingw32_bindir}/dbus-monitor.exe
-%{_mingw32_bindir}/dbus-send.exe
-%{_mingw32_bindir}/libdbus-1-3.dll
-%{_mingw32_libdir}/libdbus-1.dll.a
-%{_mingw32_libdir}/libdbus-1.la
-%{_mingw32_libdir}/pkgconfig/dbus-1.pc
-%{_mingw32_sysconfdir}/dbus-1/
-%{_mingw32_includedir}/dbus-1.0/
-%{_mingw32_libdir}/dbus-1.0/
+%{mingw32_bindir}/dbus-daemon.exe
+%{mingw32_bindir}/dbus-launch.exe
+%{mingw32_bindir}/dbus-monitor.exe
+%{mingw32_bindir}/dbus-send.exe
+%{mingw32_bindir}/libdbus-1-3.dll
+%{mingw32_libdir}/libdbus-1.dll.a
+%{mingw32_libdir}/libdbus-1.la
+%{mingw32_libdir}/pkgconfig/dbus-1.pc
+%{mingw32_sysconfdir}/dbus-1/
+%{mingw32_includedir}/dbus-1.0/
+%{mingw32_libdir}/dbus-1.0/
 
 %files -n mingw32-dbus-static
 %defattr(-,root,root,-)
-%{_mingw32_libdir}/libdbus-1.a
+%{mingw32_libdir}/libdbus-1.a
 
 %changelog
 * Wed Mar 07 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.4.6-4
 - Renamed the source package to mingw-dbus (RHBZ #800858)
+- Use mingw macros without leading underscore
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.4.6-3
 - Rebuild against the mingw-w64 toolchain