[mingw-libsoup: 30/30] Use mingw macros without leading underscore

[Kalev Lember]

commit cbff7489e45262e62b8c604d7c423140d43355a6
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Mar 6 21:30:56 2012 +0200

    Use mingw macros without leading underscore

 mingw-libsoup.spec |   39 ++++++++++++++++++++-------------------
 1 files changed, 20 insertions(+), 19 deletions(-)
---
diff --git a/mingw-libsoup.spec b/mingw-libsoup.spec
index 098b8e9..ae35d2b 100644
--- a/mingw-libsoup.spec
+++ b/mingw-libsoup.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}
 
 # first two digits of version
 %define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
@@ -69,7 +69,7 @@ Group:		Development/Libraries
 Static version of the MinGW Windows Libsoup library.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -81,7 +81,7 @@ Static version of the MinGW Windows Libsoup library.
 # Libsoup can't build static and shared libraries in one go, so we build the package twice here
 mkdir build_static
 pushd build_static
-	%{_mingw32_configure}		\
+	%{mingw32_configure}		\
 		--without-apache-httpd	\
 		--enable-static		\
 		--disable-shared	\
@@ -92,7 +92,7 @@ popd
 
 mkdir build_shared
 pushd build_shared
-	%{_mingw32_configure}		\
+	%{mingw32_configure}		\
 		--without-apache-httpd	\
 		--disable-static	\
 		--enable-shared		\
@@ -108,37 +108,38 @@ make -C build_shared DESTDIR=$RPM_BUILD_ROOT install
 # Install all the files from the static build in a seperate folder
 # and move the static libraries to the right location
 make -C build_static DESTDIR=$RPM_BUILD_ROOT/build_static install
-mv $RPM_BUILD_ROOT/build_static%{_mingw32_libdir}/*.a $RPM_BUILD_ROOT%{_mingw32_libdir}
+mv $RPM_BUILD_ROOT/build_static%{mingw32_libdir}/*.a $RPM_BUILD_ROOT%{mingw32_libdir}
 
 # Remove the .la files
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
 
 # Drop the folder which was temporary used for installing the static bits
 rm -rf $RPM_BUILD_ROOT/build_static
 
 # Strip all the GTK-Doc
-rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc
 
 
 %files -n mingw32-libsoup
 %doc COPYING
-%{_mingw32_bindir}/libsoup-2.4-1.dll
-%{_mingw32_bindir}/libsoup-gnome-2.4-1.dll
-%{_mingw32_includedir}/libsoup-2.4
-%{_mingw32_includedir}/libsoup-gnome-2.4
-%{_mingw32_libdir}/libsoup-2.4.dll.a
-%{_mingw32_libdir}/libsoup-gnome-2.4.dll.a
-%{_mingw32_libdir}/pkgconfig/libsoup-2.4.pc
-%{_mingw32_libdir}/pkgconfig/libsoup-gnome-2.4.pc
+%{mingw32_bindir}/libsoup-2.4-1.dll
+%{mingw32_bindir}/libsoup-gnome-2.4-1.dll
+%{mingw32_includedir}/libsoup-2.4
+%{mingw32_includedir}/libsoup-gnome-2.4
+%{mingw32_libdir}/libsoup-2.4.dll.a
+%{mingw32_libdir}/libsoup-gnome-2.4.dll.a
+%{mingw32_libdir}/pkgconfig/libsoup-2.4.pc
+%{mingw32_libdir}/pkgconfig/libsoup-gnome-2.4.pc
 
 %files -n mingw32-libsoup-static
-%{_mingw32_libdir}/libsoup-2.4.a
-%{_mingw32_libdir}/libsoup-gnome-2.4.a
+%{mingw32_libdir}/libsoup-2.4.a
+%{mingw32_libdir}/libsoup-gnome-2.4.a
 
 
 %changelog
 * Tue Mar 06 2012 Kalev Lember <kalevlember at gmail.com> - 2.37.90-2
 - Renamed the source package to mingw-libsoup (#800433)
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Kalev Lember <kalevlember at gmail.com> - 2.37.90-1
 - Update to 2.37.90