[mingw-gtk3] Use mingw macros without leading underscore

[Kalev Lember]

commit 85403d511ba6ae2f3e310f5b2982b005234b1ad9
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 14 13:34:26 2012 +0200

    Use mingw macros without leading underscore

 mingw-gtk3.spec |  116 +++++++++++++++++++++++++++---------------------------
 1 files changed, 58 insertions(+), 58 deletions(-)
---
diff --git a/mingw-gtk3.spec b/mingw-gtk3.spec
index 7e7cce3..8876146 100644
--- a/mingw-gtk3.spec
+++ b/mingw-gtk3.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 bin_version 3.0.0
 # first two digits of version
@@ -66,7 +66,7 @@ suites.
 This package contains the MinGW Windows cross compiled GTK+ 3 library.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -74,7 +74,7 @@ This package contains the MinGW Windows cross compiled GTK+ 3 library.
 
 
 %build
-%{_mingw32_configure} \
+%{mingw32_configure} \
   --enable-gtk2-dependency \
   --disable-cups
 
@@ -84,80 +84,80 @@ make %{?_smp_mflags} V=1
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT/%{_mingw32_libdir}/charset.alias
+rm -f $RPM_BUILD_ROOT/%{mingw32_libdir}/charset.alias
 
 # Remove manpages which duplicate those in Fedora native.
-rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
+rm -rf $RPM_BUILD_ROOT%{mingw32_mandir}
 
 # Remove documentation too.
-rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc
 
 # Remove unneeded files
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/*.def
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gtk-3.0/%{bin_version}/engines/*.dll.a
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gtk-3.0/%{bin_version}/engines/*.la
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/*.dll.a
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/*.la
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.def
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/gtk-3.0/%{bin_version}/engines/*.dll.a
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/gtk-3.0/%{bin_version}/engines/*.la
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/*.dll.a
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/*.la
 
 # Install the gtk.immodules file
-mkdir -p $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/gtk-3.0/
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/gtk-3.0/
+mkdir -p $RPM_BUILD_ROOT%{mingw32_sysconfdir}/gtk-3.0/
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{mingw32_sysconfdir}/gtk-3.0/
 
 %find_lang %{name} --all-name
 
 
 %postun -n mingw32-gtk3
 if [ $1 -eq 0 ] ; then
-    /usr/bin/glib-compile-schemas %{_mingw32_datadir}/glib-2.0/schemas &> /dev/null || :
+    /usr/bin/glib-compile-schemas %{mingw32_datadir}/glib-2.0/schemas &> /dev/null || :
 fi
 
 %posttrans -n mingw32-gtk3
-/usr/bin/glib-compile-schemas %{_mingw32_datadir}/glib-2.0/schemas &> /dev/null || :
+/usr/bin/glib-compile-schemas %{mingw32_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %files -n mingw32-gtk3 -f %{name}.lang
 %doc COPYING
-%{_mingw32_bindir}/gtk3-demo-application.exe
-%{_mingw32_bindir}/gtk3-demo.exe
-%{_mingw32_bindir}/gtk3-widget-factory.exe
-%{_mingw32_bindir}/gtk-query-immodules-3.0.exe
-%{_mingw32_bindir}/libgdk-3-0.dll
-%{_mingw32_bindir}/libgailutil-3-0.dll
-%{_mingw32_bindir}/libgtk-3-0.dll
-%{_mingw32_sysconfdir}/gtk-3.0/
-%{_mingw32_includedir}/gtk-3.0/
-%{_mingw32_includedir}/gail-3.0/
-%dir %{_mingw32_libdir}/gtk-3.0
-%dir %{_mingw32_libdir}/gtk-3.0/%{bin_version}
-%dir %{_mingw32_libdir}/gtk-3.0/%{bin_version}/engines
-%{_mingw32_libdir}/gtk-3.0/%{bin_version}/engines/libwimp.dll
-%dir %{_mingw32_libdir}/gtk-3.0/%{bin_version}/immodules
-%{_mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/im-am-et.dll
-%{_mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/im-cedilla.dll
-%{_mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/im-cyrillic-translit.dll
-%{_mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/im-ime.dll
-%{_mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/im-inuktitut.dll
-%{_mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/im-ipa.dll
-%{_mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/im-multipress.dll
-%{_mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/im-thai.dll
-%{_mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/im-ti-er.dll
-%{_mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/im-ti-et.dll
-%{_mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/im-viqr.dll
-%{_mingw32_libdir}/libgailutil-3.dll.a
-%{_mingw32_libdir}/libgdk-3.dll.a
-%{_mingw32_libdir}/libgtk-3.dll.a
-%{_mingw32_libdir}/pkgconfig/gail-3.0.pc
-%{_mingw32_libdir}/pkgconfig/gdk-3.0.pc
-%{_mingw32_libdir}/pkgconfig/gdk-win32-3.0.pc
-%{_mingw32_libdir}/pkgconfig/gtk+-3.0.pc
-%{_mingw32_libdir}/pkgconfig/gtk+-win32-3.0.pc
-%{_mingw32_datadir}/aclocal/gtk-3.0.m4
-%{_mingw32_datadir}/glib-2.0/schemas/org.gtk.Demo.gschema.xml
-%{_mingw32_datadir}/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml
-%{_mingw32_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
-%{_mingw32_datadir}/gtk-3.0/
-%{_mingw32_datadir}/themes/*
+%{mingw32_bindir}/gtk3-demo-application.exe
+%{mingw32_bindir}/gtk3-demo.exe
+%{mingw32_bindir}/gtk3-widget-factory.exe
+%{mingw32_bindir}/gtk-query-immodules-3.0.exe
+%{mingw32_bindir}/libgdk-3-0.dll
+%{mingw32_bindir}/libgailutil-3-0.dll
+%{mingw32_bindir}/libgtk-3-0.dll
+%{mingw32_sysconfdir}/gtk-3.0/
+%{mingw32_includedir}/gtk-3.0/
+%{mingw32_includedir}/gail-3.0/
+%dir %{mingw32_libdir}/gtk-3.0
+%dir %{mingw32_libdir}/gtk-3.0/%{bin_version}
+%dir %{mingw32_libdir}/gtk-3.0/%{bin_version}/engines
+%{mingw32_libdir}/gtk-3.0/%{bin_version}/engines/libwimp.dll
+%dir %{mingw32_libdir}/gtk-3.0/%{bin_version}/immodules
+%{mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/im-am-et.dll
+%{mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/im-cedilla.dll
+%{mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/im-cyrillic-translit.dll
+%{mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/im-ime.dll
+%{mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/im-inuktitut.dll
+%{mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/im-ipa.dll
+%{mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/im-multipress.dll
+%{mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/im-thai.dll
+%{mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/im-ti-er.dll
+%{mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/im-ti-et.dll
+%{mingw32_libdir}/gtk-3.0/%{bin_version}/immodules/im-viqr.dll
+%{mingw32_libdir}/libgailutil-3.dll.a
+%{mingw32_libdir}/libgdk-3.dll.a
+%{mingw32_libdir}/libgtk-3.dll.a
+%{mingw32_libdir}/pkgconfig/gail-3.0.pc
+%{mingw32_libdir}/pkgconfig/gdk-3.0.pc
+%{mingw32_libdir}/pkgconfig/gdk-win32-3.0.pc
+%{mingw32_libdir}/pkgconfig/gtk+-3.0.pc
+%{mingw32_libdir}/pkgconfig/gtk+-win32-3.0.pc
+%{mingw32_datadir}/aclocal/gtk-3.0.m4
+%{mingw32_datadir}/glib-2.0/schemas/org.gtk.Demo.gschema.xml
+%{mingw32_datadir}/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml
+%{mingw32_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
+%{mingw32_datadir}/gtk-3.0/
+%{mingw32_datadir}/themes/*
 
 
 %changelog