From e3a8ecfeb1c4305a2a1c0630c54bfb31b7ba1b05 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Tue, 6 Mar 2012 19:32:15 +0100 Subject: [PATCH] Use mingw macros without leading underscore --- mingw-expat.spec | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/mingw-expat.spec b/mingw-expat.spec index 1a1bc8a..5bb3459 100644 --- a/mingw-expat.spec +++ b/mingw-expat.spec @@ -1,8 +1,8 @@ -%define __strip %{_mingw32_strip} -%define __objdump %{_mingw32_objdump} +%define __strip %{mingw32_strip} +%define __objdump %{mingw32_objdump} %define _use_internal_dependency_generator 0 -%define __find_requires %{_mingw32_findrequires} -%define __find_provides %{_mingw32_findprovides} +%define __find_requires %{mingw32_findrequires} +%define __find_provides %{mingw32_findprovides} Name: mingw-expat Version: 2.0.1 @@ -55,7 +55,7 @@ chmod -x COPYING %build -%{_mingw32_configure} +%{mingw32_configure} make %{?_smp_mflags} @@ -64,10 +64,10 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install # Remove static libraries but DON'T remove *.dll.a files. -rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libexpat.a +rm $RPM_BUILD_ROOT%{mingw32_libdir}/libexpat.a # Remove documentation which duplicates that found in the native package. -rm -r $RPM_BUILD_ROOT%{_mingw32_mandir}/man1 +rm -r $RPM_BUILD_ROOT%{mingw32_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT @@ -76,17 +76,18 @@ rm -rf $RPM_BUILD_ROOT %files -n mingw32-expat %defattr(-,root,root) %doc COPYING -%{_mingw32_bindir}/libexpat-1.dll -%{_mingw32_bindir}/xmlwf -%{_mingw32_libdir}/libexpat.dll.a -%{_mingw32_libdir}/libexpat.la -%{_mingw32_includedir}/expat.h -%{_mingw32_includedir}/expat_external.h +%{mingw32_bindir}/libexpat-1.dll +%{mingw32_bindir}/xmlwf +%{mingw32_libdir}/libexpat.dll.a +%{mingw32_libdir}/libexpat.la +%{mingw32_includedir}/expat.h +%{mingw32_includedir}/expat_external.h %changelog * Tue Mar 06 2012 Erik van Pienbroek - 2.0.1-10 - Renamed the source package to mingw-expat (RHBZ #800377) +- Use mingw macros without leading underscore * Mon Feb 27 2012 Erik van Pienbroek - 2.0.1-9 - Rebuild against the mingw-w64 toolchain