From 5d10b97d998495f12674973279953668b40845bf Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sun, 8 May 2016 12:58:13 +0200 Subject: [PATCH] Update config.{guess,sub} in %%mingw_configure (#1288256) --- macros.mingw | 3 +++ mingw-filesystem.spec | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/macros.mingw b/macros.mingw index 1f12836..a0bd07f 100644 --- a/macros.mingw +++ b/macros.mingw @@ -39,6 +39,9 @@ %mingw_configure \ run_mingw_configure() \ { \ +[ "%_configure_gnuconfig_hack" = 1 ] && for i in $(find . -name config.guess -o -name config.sub) ; do \ + [ -f /usr/lib/rpm/redhat/$(basename $i) ] && %{__rm} -f $i && %{__cp} -fv /usr/lib/rpm/redhat/$(basename $i) $i ; \ +done ; \ %if 0%{?mingw_build_win32} == 1 \ mkdir build_win32$MINGW_BUILDDIR_SUFFIX \ pushd build_win32$MINGW_BUILDDIR_SUFFIX \ diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index 78d6789..19f429a 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -6,8 +6,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: mingw-filesystem -Version: 100 -Release: 3%{?dist} +Version: 101 +Release: 1%{?dist} Summary: MinGW cross compiler base filesystem and environment Group: Development/Libraries @@ -309,6 +309,9 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/ %changelog +* Sun May 8 2016 Erik van Pienbroek - 101-1 +- Update config.{guess,sub} in %%mingw_configure (#1288256) + * Thu Feb 04 2016 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild