[mingw-glib-networking: 13/13] Use mingw macros without leading underscore

epienbro epienbro at fedoraproject.org
Tue Mar 6 19:56:23 UTC 2012


commit a5ff6686560f66d6509dd59130d8cbac84f71dfc
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Tue Mar 6 20:55:14 2012 +0100

    Use mingw macros without leading underscore

 mingw-glib-networking.spec |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/mingw-glib-networking.spec b/mingw-glib-networking.spec
index 1edf648..3113698 100644
--- a/mingw-glib-networking.spec
+++ b/mingw-glib-networking.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}')
@@ -40,7 +40,7 @@ Summary:        MinGW Windows glib-networking library
 This package contains modules that extend the networking support in GIO.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -52,27 +52,28 @@ automake
 
 
 %build
-%{_mingw32_configure} --disable-static
+%{mingw32_configure} --disable-static
 make %{?_smp_mflags} V=1
 
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gio/modules/*.dll.a
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gio/modules/*.la
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/gio/modules/*.dll.a
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/gio/modules/*.la
 
 %find_lang glib-networking
 
 
 %files -n mingw32-glib-networking -f glib-networking.lang
 %doc COPYING
-%{_mingw32_libdir}/gio/modules/libgiognutls.dll
+%{mingw32_libdir}/gio/modules/libgiognutls.dll
 
 
 %changelog
 * Tue Mar 06 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.31.16-2
 - Renamed the source package to mingw-glib-networking (RHBZ #800391)
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Kalev Lember <kalevlember at gmail.com> - 2.31.16-1
 - Update to 2.31.16


More information about the scm-commits mailing list