From d2878f5608958feb34c28c37882774b4720e67b738469420586b7f9791c315df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:51:52 +0000 Subject: [PATCH 1/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-config-ini revision:10, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-config-ini?expand=0&rev=12 --- ghc-config-ini.changes | 5 +++++ ghc-config-ini.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-config-ini.changes b/ghc-config-ini.changes index 2f47e23..57483dd 100644 --- a/ghc-config-ini.changes +++ b/ghc-config-ini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + ------------------------------------------------------------------- Wed Sep 30 08:36:56 UTC 2020 - psimons@suse.com diff --git a/ghc-config-ini.spec b/ghc-config-ini.spec index 1a342ae..a144568 100644 --- a/ghc-config-ini.spec +++ b/ghc-config-ini.spec @@ -33,6 +33,12 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-devel BuildRequires: ghc-transformers-devel BuildRequires: ghc-unordered-containers-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-directory-devel BuildRequires: ghc-hedgehog-devel From 45b436661632775c14a9185ad32aa35b8bbfab22cbdf4a80a0ba2c81c5983df5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:47:49 +0000 Subject: [PATCH 2/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-config-ini revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-config-ini?expand=0&rev=13 --- ghc-config-ini.changes | 2 +- ghc-config-ini.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-config-ini.changes b/ghc-config-ini.changes index 57483dd..06caa78 100644 --- a/ghc-config-ini.changes +++ b/ghc-config-ini.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 ------------------------------------------------------------------- Wed Sep 30 08:36:56 UTC 2020 - psimons@suse.com diff --git a/ghc-config-ini.spec b/ghc-config-ini.spec index a144568..a985c3b 100644 --- a/ghc-config-ini.spec +++ b/ghc-config-ini.spec @@ -33,12 +33,7 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-devel BuildRequires: ghc-transformers-devel BuildRequires: ghc-unordered-containers-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-directory-devel BuildRequires: ghc-hedgehog-devel From 1e16c3b731a2ebc5d68017c445e13b86ef9af3e37ce1161a6a915af2a0ecf495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:28:19 +0000 Subject: [PATCH 3/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-config-ini revision:13, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-config-ini?expand=0&rev=14 --- ghc-config-ini.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-config-ini.changes b/ghc-config-ini.changes index 06caa78..df1ed73 100644 --- a/ghc-config-ini.changes +++ b/ghc-config-ini.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