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

Kalev Lember kalev at fedoraproject.org
Wed Mar 7 17:23:56 UTC 2012


commit 9fa5b7a0138e27977ca1efaf432af9ee890e1525
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 7 19:20:57 2012 +0200

    Use mingw macros without leading underscore

 mingw-SDL_image.spec |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/mingw-SDL_image.spec b/mingw-SDL_image.spec
index ff8943b..09c30b8 100644
--- a/mingw-SDL_image.spec
+++ b/mingw-SDL_image.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-SDL_image
@@ -30,7 +30,7 @@ designed to provide fast access to the graphics frame buffer and audio
 device.  This package contains a simple library for loading images of
 various formats (BMP, TIF, JPEG, PNG) as SDL surfaces.
 
-%{?_mingw32_description}
+%{?mingw32_description}
 
 
 %package -n mingw32-SDL_image
@@ -43,10 +43,10 @@ designed to provide fast access to the graphics frame buffer and audio
 device.  This package contains a simple library for loading images of
 various formats (BMP, TIF, JPEG, PNG) as SDL surfaces.
 
-%{?_mingw32_description}
+%{?mingw32_description}
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 %prep
 %setup -q -n SDL_image-%{version}
@@ -54,7 +54,7 @@ various formats (BMP, TIF, JPEG, PNG) as SDL surfaces.
 %build
 # the --disabled-*-shared lines below stops SDL_image from loading those
 # libraries at link time. Instead they are loaded when needed.
-%{_mingw32_configure} \
+%{mingw32_configure} \
     --disable-jpg-shared \
     --disable-png-shared \
     --disable-tif-shared \
@@ -73,15 +73,16 @@ mv CHANGES.new CHANGES
 
 %files -n mingw32-SDL_image
 %doc README CHANGES COPYING
-%{_mingw32_bindir}/SDL_image.dll
-%{_mingw32_libdir}/libSDL_image.dll.a
-%{_mingw32_libdir}/pkgconfig/SDL_image.pc
-%{_mingw32_libdir}/libSDL_image.la
-%{_mingw32_includedir}/SDL
+%{mingw32_bindir}/SDL_image.dll
+%{mingw32_libdir}/libSDL_image.dll.a
+%{mingw32_libdir}/pkgconfig/SDL_image.pc
+%{mingw32_libdir}/libSDL_image.la
+%{mingw32_includedir}/SDL
 
 %changelog
 * Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 1.2.12-3
 - Renamed the source package to mingw-SDL_image (#801025)
+- Use mingw macros without leading underscore
 
 * Tue Feb 28 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.2.12-2
 - Rebuild against the mingw-w64 toolchain


More information about the scm-commits mailing list