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

[epienbro]

commit c4914343de9157cebbaff3aa4b345efed235cfbd
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Mar 7 18:37:47 2012 +0100

    Use mingw macros without leading underscore

 mingw-gtk-vnc.spec |   49 +++++++++++++++++++++++++------------------------
 1 files changed, 25 insertions(+), 24 deletions(-)
---
diff --git a/mingw-gtk-vnc.spec b/mingw-gtk-vnc.spec
index 82eb4e5..a71d9cc 100644
--- a/mingw-gtk-vnc.spec
+++ b/mingw-gtk-vnc.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-gtk-vnc
 Version: 0.5.0
@@ -67,7 +67,7 @@ screenshots of a VNC desktop
 gtk-vnc is a VNC viewer widget for GTK. It is built using coroutines
 allowing it to be completely asynchronous while remaining single threaded.
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -77,12 +77,12 @@ cp -a gtk-vnc-%{version} gtk-vnc2-%{version}
 
 %build
 cd gtk-vnc-%{version}
-%{_mingw32_configure} --without-python --with-examples --without-sasl --with-gtk=2.0
+%{mingw32_configure} --without-python --with-examples --without-sasl --with-gtk=2.0
 %__make %{?_smp_mflags} V=1
 cd ..
 
 cd gtk-vnc2-%{version}
-%{_mingw32_configure} --without-python --without-examples --without-sasl --with-gtk=3.0
+%{mingw32_configure} --without-python --without-examples --without-sasl --with-gtk=3.0
 %__make %{?_smp_mflags} V=1
 cd ..
 
@@ -96,10 +96,10 @@ make DESTDIR=$RPM_BUILD_ROOT install
 cd ..
 
 # Remove static libraries but DON'T remove *.dll.a files.
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/libgtk-vnc-1.0.a
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/libgtk-vnc-2.0.a
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/libgvnc-1.0.a
-rm -f $RPM_BUILD_ROOT%{_mingw32_mandir}/man1/gvnccapture.1*
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/libgtk-vnc-1.0.a
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/libgtk-vnc-2.0.a
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/libgvnc-1.0.a
+rm -f $RPM_BUILD_ROOT%{mingw32_mandir}/man1/gvnccapture.1*
 
 # Drop all .la files
 find $RPM_BUILD_ROOT -name "*.la" -delete
@@ -108,11 +108,11 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
 %files -n mingw32-gtk-vnc -f gtk-vnc.lang
-%{_mingw32_bindir}/gvncviewer.exe
-%{_mingw32_bindir}/libgtk-vnc-1.0-0.dll
-%{_mingw32_libdir}/libgtk-vnc-1.0.dll.a
-%{_mingw32_libdir}/pkgconfig/gtk-vnc-1.0.pc
-%{_mingw32_includedir}/gtk-vnc-1.0
+%{mingw32_bindir}/gvncviewer.exe
+%{mingw32_bindir}/libgtk-vnc-1.0-0.dll
+%{mingw32_libdir}/libgtk-vnc-1.0.dll.a
+%{mingw32_libdir}/pkgconfig/gtk-vnc-1.0.pc
+%{mingw32_includedir}/gtk-vnc-1.0
 
 %files -n mingw32-gvnc
 %doc gtk-vnc-%{version}/AUTHORS
@@ -121,24 +121,25 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 %doc gtk-vnc-%{version}/NEWS
 %doc gtk-vnc-%{version}/README
 %doc gtk-vnc-%{version}/COPYING.LIB
-%{_mingw32_bindir}/libgvnc-1.0-0.dll
-%{_mingw32_libdir}/libgvnc-1.0.dll.a
-%{_mingw32_libdir}/pkgconfig/gvnc-1.0.pc
-%{_mingw32_includedir}/gvnc-1.0
+%{mingw32_bindir}/libgvnc-1.0-0.dll
+%{mingw32_libdir}/libgvnc-1.0.dll.a
+%{mingw32_libdir}/pkgconfig/gvnc-1.0.pc
+%{mingw32_includedir}/gvnc-1.0
 
 %files -n mingw32-gtk-vnc2
-%{_mingw32_bindir}/libgtk-vnc-2.0-0.dll
-%{_mingw32_libdir}/libgtk-vnc-2.0.dll.a
-%{_mingw32_libdir}/pkgconfig/gtk-vnc-2.0.pc
-%{_mingw32_includedir}/gtk-vnc-2.0
+%{mingw32_bindir}/libgtk-vnc-2.0-0.dll
+%{mingw32_libdir}/libgtk-vnc-2.0.dll.a
+%{mingw32_libdir}/pkgconfig/gtk-vnc-2.0.pc
+%{mingw32_includedir}/gtk-vnc-2.0
 
 %files -n mingw32-gvnc-tools
-%{_mingw32_bindir}/gvnccapture.exe
+%{mingw32_bindir}/gvnccapture.exe
 
 
 %changelog
 * Wed Mar 07 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.5.0-6
 - Renamed the source package to mingw-gtk-vnc (RHBZ #800881)
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.5.0-5
 - Rebuild against the mingw-w64 toolchain