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

Kalev Lember kalev at fedoraproject.org
Wed Mar 7 16:41:34 UTC 2012


commit bf3e5a744c878e30024e8566b4ebab360d623771
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 7 18:39:14 2012 +0200

    Use mingw macros without leading underscore

 mingw-pdcurses.spec |   49 +++++++++++++++++++++++++------------------------
 1 files changed, 25 insertions(+), 24 deletions(-)
---
diff --git a/mingw-pdcurses.spec b/mingw-pdcurses.spec
index df4fb0b..0d9dae8 100644
--- a/mingw-pdcurses.spec
+++ b/mingw-pdcurses.spec
@@ -1,5 +1,5 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
+%define __strip %{mingw32_strip}
+%define __objdump %{mingw32_objdump}
 
 Name:           mingw-pdcurses
 Version:        3.4
@@ -55,43 +55,44 @@ don't use any of the extensions specific to ncurses.
 %build
 pushd win32
 make -f mingwin32.mak \
-  CC=%{_mingw32_cc} \
-  LINK=%{_mingw32_cc} \
+  CC=%{mingw32_cc} \
+  LINK=%{mingw32_cc} \
   WIDE=Y UTF8=Y DLL=Y
 popd
 
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}
-mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}
+mkdir -p $RPM_BUILD_ROOT%{mingw32_bindir}
+mkdir -p $RPM_BUILD_ROOT%{mingw32_libdir}
+mkdir -p $RPM_BUILD_ROOT%{mingw32_includedir}
 
-install win32/*.exe $RPM_BUILD_ROOT%{_mingw32_bindir}
-install win32/pdcurses.dll $RPM_BUILD_ROOT%{_mingw32_bindir}/pdcurses.dll
-install win32/pdcurses.a $RPM_BUILD_ROOT%{_mingw32_libdir}/libpdcurses.dll.a
-install -m 0644 curses.h panel.h term.h $RPM_BUILD_ROOT%{_mingw32_includedir}
+install win32/*.exe $RPM_BUILD_ROOT%{mingw32_bindir}
+install win32/pdcurses.dll $RPM_BUILD_ROOT%{mingw32_bindir}/pdcurses.dll
+install win32/pdcurses.a $RPM_BUILD_ROOT%{mingw32_libdir}/libpdcurses.dll.a
+install -m 0644 curses.h panel.h term.h $RPM_BUILD_ROOT%{mingw32_includedir}
 
 
 %files -n mingw32-pdcurses
-%{_mingw32_bindir}/pdcurses.dll
-%{_mingw32_libdir}/libpdcurses.dll.a
-%{_mingw32_includedir}/curses.h
-%{_mingw32_includedir}/panel.h
-%{_mingw32_includedir}/term.h
-%{_mingw32_bindir}/firework.exe
-%{_mingw32_bindir}/newdemo.exe
-%{_mingw32_bindir}/ptest.exe
-%{_mingw32_bindir}/rain.exe
-%{_mingw32_bindir}/testcurs.exe
-%{_mingw32_bindir}/tuidemo.exe
-%{_mingw32_bindir}/xmas.exe
-%{_mingw32_bindir}/worm.exe
+%{mingw32_bindir}/pdcurses.dll
+%{mingw32_libdir}/libpdcurses.dll.a
+%{mingw32_includedir}/curses.h
+%{mingw32_includedir}/panel.h
+%{mingw32_includedir}/term.h
+%{mingw32_bindir}/firework.exe
+%{mingw32_bindir}/newdemo.exe
+%{mingw32_bindir}/ptest.exe
+%{mingw32_bindir}/rain.exe
+%{mingw32_bindir}/testcurs.exe
+%{mingw32_bindir}/tuidemo.exe
+%{mingw32_bindir}/xmas.exe
+%{mingw32_bindir}/worm.exe
 
 
 %changelog
 * Wed Mar 07 2012 Kalev Lember <kalevlember at gmail.com> - 3.4-11
 - Renamed the source package to mingw-pdcurses (#801012)
 - Modernize the spec file
+- Use mingw macros without leading underscore
 
 * Mon Feb 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.4-10
 - Rebuild against the mingw-w64 toolchain


More information about the scm-commits mailing list