From eeeb72735270e98382a852ef0a47ae9fb4d7194315edca61b0d7d847ff7da6b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:57 +0000 Subject: [PATCH 1/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-shelly revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-shelly?expand=0&rev=23 --- ghc-shelly.changes | 5 +++++ ghc-shelly.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-shelly.changes b/ghc-shelly.changes index c53c31a..97bca98 100644 --- a/ghc-shelly.changes +++ b/ghc-shelly.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + ------------------------------------------------------------------- Mon Aug 31 09:34:38 UTC 2020 - psimons@suse.com diff --git a/ghc-shelly.spec b/ghc-shelly.spec index c2e9ae0..b38878d 100644 --- a/ghc-shelly.spec +++ b/ghc-shelly.spec @@ -46,6 +46,12 @@ BuildRequires: ghc-transformers-base-devel BuildRequires: ghc-transformers-devel BuildRequires: ghc-unix-compat-devel BuildRequires: ghc-unix-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 %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-hspec-contrib-devel From 764cd7428813ef4e7138256a5faef9ec9c2dc025ddfcfc6ae129fd5cc0a8ca67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:49:08 +0000 Subject: [PATCH 2/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-shelly revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-shelly?expand=0&rev=24 --- ghc-shelly.changes | 2 +- ghc-shelly.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-shelly.changes b/ghc-shelly.changes index 97bca98..4637fcb 100644 --- a/ghc-shelly.changes +++ b/ghc-shelly.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 ------------------------------------------------------------------- Mon Aug 31 09:34:38 UTC 2020 - psimons@suse.com diff --git a/ghc-shelly.spec b/ghc-shelly.spec index b38878d..39c3640 100644 --- a/ghc-shelly.spec +++ b/ghc-shelly.spec @@ -46,12 +46,7 @@ BuildRequires: ghc-transformers-base-devel BuildRequires: ghc-transformers-devel BuildRequires: ghc-unix-compat-devel BuildRequires: ghc-unix-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-hspec-contrib-devel From e2b6c9a9bdd44356c5cdad24753f34b23402a369b18165ed285dca6d20be88f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:29:19 +0000 Subject: [PATCH 3/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-shelly revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-shelly?expand=0&rev=25 --- ghc-shelly.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-shelly.changes b/ghc-shelly.changes index 4637fcb..ef85db9 100644 --- a/ghc-shelly.changes +++ b/ghc-shelly.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup +Thu Dec 17 12:20:00 UTC 2020 - Ondřej Súkup - disable %{ix86} build