[mingw-dlfcn: 16/16] Use mingw macros without leading underscore

epienbro epienbro at fedoraproject.org
Wed Mar 7 16:47:47 UTC 2012


commit 54770ec39a69361f98cb6f7efb64ce3b46aa2117
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Mar 7 17:46:21 2012 +0100

    Use mingw macros without leading underscore

 mingw-dlfcn.spec |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/mingw-dlfcn.spec b/mingw-dlfcn.spec
index de93722..3fc3c10 100644
--- a/mingw-dlfcn.spec
+++ b/mingw-dlfcn.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 realname dlfcn-win32
 
@@ -49,7 +49,7 @@ Group:          Development/Libraries
 Static version of the MinGW Windows dlfcn library.
 
 
-%{?_mingw32_debug_package}
+%{?mingw32_debug_package}
 
 
 %prep
@@ -65,8 +65,8 @@ Static version of the MinGW Windows dlfcn library.
 
 
 %build
-%{_mingw32_configure} \
-  --incdir=%{_mingw32_includedir} \
+%{mingw32_configure} \
+  --incdir=%{mingw32_includedir} \
   --cc=i686-w64-mingw32-gcc \
   --enable-shared=yes \
   --enable-static=yes \
@@ -80,17 +80,18 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 %files -n mingw32-dlfcn
 %doc README COPYING
-%{_mingw32_bindir}/libdl.dll
-%{_mingw32_libdir}/libdl.dll.a
-%{_mingw32_includedir}/dlfcn.h
+%{mingw32_bindir}/libdl.dll
+%{mingw32_libdir}/libdl.dll.a
+%{mingw32_includedir}/dlfcn.h
 
 %files -n mingw32-dlfcn-static
-%{_mingw32_libdir}/libdl.a
+%{mingw32_libdir}/libdl.a
 
 
 %changelog
 * Wed Mar 07 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 0-0.12.r11
 - Renamed the source package to mingw-dlfcn (RHBZ #800861)
+- Use mingw macros without leading underscore
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 0-0.11.r11
 - Rebuild against the mingw-w64 toolchain


More information about the scm-commits mailing list