diff --git a/mingw-termcap.spec b/mingw-termcap.spec index 86ac66f..d2e5d30 100644 --- a/mingw-termcap.spec +++ b/mingw-termcap.spec @@ -5,8 +5,8 @@ # ncurses. So here we are using the GNU termcap library which is # regretably GPL'd. -%define __strip %{_mingw32_strip} -%define __objdump %{_mingw32_objdump} +%define __strip %{mingw32_strip} +%define __objdump %{mingw32_objdump} Name: mingw-termcap Version: 1.3.1 @@ -60,11 +60,11 @@ autoconf %build -%{_mingw32_configure} +%{mingw32_configure} make # Build a shared library. No need for -fPIC on Windows. -%{_mingw32_cc} -shared \ +%{mingw32_cc} -shared \ -Wl,--out-implib,libtermcap.dll.a \ -o libtermcap-0.dll \ termcap.o tparam.o version.o @@ -72,37 +72,38 @@ make %install make install \ - prefix=$RPM_BUILD_ROOT%{_mingw32_prefix} \ - exec_prefix=$RPM_BUILD_ROOT%{_mingw32_prefix} \ + prefix=$RPM_BUILD_ROOT%{mingw32_prefix} \ + exec_prefix=$RPM_BUILD_ROOT%{mingw32_prefix} \ oldincludedir= # Move the shared library to the correct locations. -mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir} -install -m 0755 libtermcap-0.dll $RPM_BUILD_ROOT%{_mingw32_bindir} -install -m 0755 libtermcap.dll.a $RPM_BUILD_ROOT%{_mingw32_libdir} +mkdir -p $RPM_BUILD_ROOT%{mingw32_bindir} +install -m 0755 libtermcap-0.dll $RPM_BUILD_ROOT%{mingw32_bindir} +install -m 0755 libtermcap.dll.a $RPM_BUILD_ROOT%{mingw32_libdir} # Don't want the static library, thank you. -rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libtermcap.a +rm $RPM_BUILD_ROOT%{mingw32_libdir}/libtermcap.a # Move the info files to the correct location. -mkdir -p $RPM_BUILD_ROOT%{_mingw32_infodir} -mv $RPM_BUILD_ROOT%{_mingw32_prefix}/info/* $RPM_BUILD_ROOT%{_mingw32_infodir} +mkdir -p $RPM_BUILD_ROOT%{mingw32_infodir} +mv $RPM_BUILD_ROOT%{mingw32_prefix}/info/* $RPM_BUILD_ROOT%{mingw32_infodir} %files -n mingw32-termcap %doc COPYING -%{_mingw32_bindir}/libtermcap-0.dll -%{_mingw32_libdir}/libtermcap.dll.a -%{_mingw32_includedir}/termcap.h +%{mingw32_bindir}/libtermcap-0.dll +%{mingw32_libdir}/libtermcap.dll.a +%{mingw32_includedir}/termcap.h # Note that we want the info files in this package because # there is no equivalent native Fedora package. -%{_mingw32_infodir}/* +%{mingw32_infodir}/* %changelog * Wed Mar 07 2012 Kalev Lember - 1.3.1-12 - Renamed the source package to mingw-termcap (#801034) - Modernize the spec file +- Use mingw macros without leading underscore * Mon Feb 27 2012 Erik van Pienbroek - 1.3.1-11 - Rebuild against the mingw-w64 toolchain