From ff8fd7de711a4393aeb91505513817e2b62852b0fe7369a9a5fc2971e4cd6fb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:51:55 +0000 Subject: [PATCH 1/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-cryptonite-conduit revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-cryptonite-conduit?expand=0&rev=39 --- ghc-cryptonite-conduit.changes | 5 +++++ ghc-cryptonite-conduit.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-cryptonite-conduit.changes b/ghc-cryptonite-conduit.changes index 26fd01b..4e4483b 100644 --- a/ghc-cryptonite-conduit.changes +++ b/ghc-cryptonite-conduit.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-cryptonite-conduit.spec b/ghc-cryptonite-conduit.spec index d1dcb13..35d5567 100644 --- a/ghc-cryptonite-conduit.spec +++ b/ghc-cryptonite-conduit.spec @@ -36,6 +36,12 @@ BuildRequires: ghc-memory-devel BuildRequires: ghc-resourcet-devel BuildRequires: ghc-rpm-macros 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 %if %{with tests} BuildRequires: ghc-conduit-combinators-devel BuildRequires: ghc-tasty-devel From c8670e331af3fd6bbf96b28e50a434e6735f8fab7aec07777eb5a04caff528d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:47:54 +0000 Subject: [PATCH 2/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-cryptonite-conduit revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-cryptonite-conduit?expand=0&rev=40 --- ghc-cryptonite-conduit.changes | 2 +- ghc-cryptonite-conduit.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-cryptonite-conduit.changes b/ghc-cryptonite-conduit.changes index 4e4483b..9ba3426 100644 --- a/ghc-cryptonite-conduit.changes +++ b/ghc-cryptonite-conduit.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-cryptonite-conduit.spec b/ghc-cryptonite-conduit.spec index 35d5567..fd11b2d 100644 --- a/ghc-cryptonite-conduit.spec +++ b/ghc-cryptonite-conduit.spec @@ -36,12 +36,7 @@ BuildRequires: ghc-memory-devel BuildRequires: ghc-resourcet-devel BuildRequires: ghc-rpm-macros 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-conduit-combinators-devel BuildRequires: ghc-tasty-devel From 54b42f81260657a7542470ee38b5f410912caecd2126bc6343704a16675b4f3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:28:23 +0000 Subject: [PATCH 3/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-cryptonite-conduit revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-cryptonite-conduit?expand=0&rev=41 --- ghc-cryptonite-conduit.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-cryptonite-conduit.changes b/ghc-cryptonite-conduit.changes index 9ba3426..b3f40c8 100644 --- a/ghc-cryptonite-conduit.changes +++ b/ghc-cryptonite-conduit.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