From c67b855e5049d8d7c4045684929b13c6db72850dce23bd75f6dc5257c20f973b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:14 +0000 Subject: [PATCH 1/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-hslogger revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hslogger?expand=0&rev=7 --- ghc-hslogger.changes | 5 +++++ ghc-hslogger.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-hslogger.changes b/ghc-hslogger.changes index 7b2d1b3..62a15f1 100644 --- a/ghc-hslogger.changes +++ b/ghc-hslogger.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:30 UTC 2020 - psimons@suse.com diff --git a/ghc-hslogger.spec b/ghc-hslogger.spec index 9cbd4bf..869f40c 100644 --- a/ghc-hslogger.spec +++ b/ghc-hslogger.spec @@ -36,6 +36,12 @@ BuildRequires: ghc-old-locale-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-time-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 %endif From 8da3d4ad1410f08264bc52aac6c452232e74d41978492403ad65bda32be02695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:48:12 +0000 Subject: [PATCH 2/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-hslogger revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hslogger?expand=0&rev=8 --- ghc-hslogger.changes | 2 +- ghc-hslogger.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-hslogger.changes b/ghc-hslogger.changes index 62a15f1..3b69c5d 100644 --- a/ghc-hslogger.changes +++ b/ghc-hslogger.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:30 UTC 2020 - psimons@suse.com diff --git a/ghc-hslogger.spec b/ghc-hslogger.spec index 869f40c..6ef1491 100644 --- a/ghc-hslogger.spec +++ b/ghc-hslogger.spec @@ -36,12 +36,7 @@ BuildRequires: ghc-old-locale-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-time-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 %endif From 1214ed7e3ac1b3791095d5c7a13a1bd6ef0e4868554e0a2df73f887216a012ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:28:41 +0000 Subject: [PATCH 3/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-hslogger revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hslogger?expand=0&rev=9 --- ghc-hslogger.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-hslogger.changes b/ghc-hslogger.changes index 3b69c5d..c937b07 100644 --- a/ghc-hslogger.changes +++ b/ghc-hslogger.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