From a409c3d575b583c504a0b4084a2d564f751c8240b3c7a664ac59d0f7709817c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:47:27 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-Glob revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-Glob?expand=0&rev=62 --- ghc-Glob.changes | 2 +- ghc-Glob.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-Glob.changes b/ghc-Glob.changes index 3bca70c..ba54010 100644 --- a/ghc-Glob.changes +++ b/ghc-Glob.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup -- force i686 arch on i586 +- disable %{ix86} build ------------------------------------------------------------------- Tue Aug 18 10:43:46 UTC 2020 - Peter Simons diff --git a/ghc-Glob.spec b/ghc-Glob.spec index 420ac0d..0e0aea6 100644 --- a/ghc-Glob.spec +++ b/ghc-Glob.spec @@ -33,12 +33,7 @@ BuildRequires: ghc-filepath-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-transformers-compat-devel BuildRequires: ghc-transformers-devel -# GHC dont support i586 -%ifarch %{ix86} -ExclusiveArch: i586 i686 -ExclusiveArch: i686 -%{expand:%%global optflags %(echo "%{optflags}"|sed -e s/i586/i686/) -march=i686 -mtune=generic} -%endif +ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel