[mingw-SDL: 17/17] Use mingw macros without leading underscore

Kalev Lember kalev at fedoraproject.org
Wed Mar 7 17:34:55 UTC 2012


commit 179c7a840eba14c1da14b21e8880ba7400b121a6
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 7 19:31:54 2012 +0200

    Use mingw macros without leading underscore

 mingw-SDL.spec |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/mingw-SDL.spec b/mingw-SDL.spec
index ccf9088..7f5758a 100644
--- a/mingw-SDL.spec
+++ b/mingw-SDL.spec
@@ -1,5 +1,5 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
+%define __strip %{mingw32_strip}
+%define __objdump %{mingw32_objdump}
 
 Name:           mingw-SDL
 Version:        1.2.13
@@ -72,7 +72,7 @@ device.
 
 
 %build
-%{_mingw32_configure} \
+%{mingw32_configure} \
   --disable-video-svga --disable-video-ggi --disable-video-aalib \
   --disable-debug \
   --enable-sdl-dlopen \
@@ -91,33 +91,34 @@ make
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # Remove static libraries but DON'T remove *.dll.a files.
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libSDL.a
+rm $RPM_BUILD_ROOT%{mingw32_libdir}/libSDL.a
 
 # Actually libSDLmain.a seems to be required.  It just contains
 # a single object file called SDL_win32_main.o.
-#rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libSDLmain.a
+#rm $RPM_BUILD_ROOT%{mingw32_libdir}/libSDLmain.a
 
 # Delete man pages since they duplicate what is already available
 # in base Fedora package.
-rm $RPM_BUILD_ROOT%{_mingw32_mandir}/man3/*.3*
+rm $RPM_BUILD_ROOT%{mingw32_mandir}/man3/*.3*
 
 
 %files -n mingw32-SDL
 %doc COPYING
-%{_mingw32_bindir}/SDL.dll
-%{_mingw32_bindir}/sdl-config
-%{_mingw32_libdir}/libSDL.dll.a
-%{_mingw32_libdir}/libSDL.la
-%{_mingw32_libdir}/libSDLmain.a
-%{_mingw32_libdir}/pkgconfig/sdl.pc
-%{_mingw32_datadir}/aclocal/sdl.m4
-%{_mingw32_includedir}/SDL
+%{mingw32_bindir}/SDL.dll
+%{mingw32_bindir}/sdl-config
+%{mingw32_libdir}/libSDL.dll.a
+%{mingw32_libdir}/libSDL.la
+%{mingw32_libdir}/libSDLmain.a
+%{mingw32_libdir}/pkgconfig/sdl.pc
+%{mingw32_datadir}/aclocal/sdl.m4
+%{mingw32_includedir}/SDL
 
 
 %changelog
 * Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 1.2.13-13
 - Renamed the source package to mingw-SDL (#801028)
 - Modernize the spec file
+- Use mingw macros without leading underscore
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.2.13-12
 - Rebuild against the mingw-w64 toolchain


More information about the scm-commits mailing list