From 48784749bbe1d41c6da48abfc3eef163184bd86e8a02129985049ec3d0bea6c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:09 +0000 Subject: [PATCH 1/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-generic-deriving revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-generic-deriving?expand=0&rev=59 --- ghc-generic-deriving.changes | 5 +++++ ghc-generic-deriving.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-generic-deriving.changes b/ghc-generic-deriving.changes index 77a04b6..129ec29 100644 --- a/ghc-generic-deriving.changes +++ b/ghc-generic-deriving.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + ------------------------------------------------------------------- Tue Oct 6 08:55:51 UTC 2020 - psimons@suse.com diff --git a/ghc-generic-deriving.spec b/ghc-generic-deriving.spec index 1503fac..b9c875b 100644 --- a/ghc-generic-deriving.spec +++ b/ghc-generic-deriving.spec @@ -30,6 +30,12 @@ BuildRequires: ghc-containers-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-template-haskell-devel BuildRequires: ghc-th-abstraction-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-hspec-devel %endif From 433f500a3d3e701bea7ffe613127d1ae8fb17a512d88e867e6247989b42e1d97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:48:06 +0000 Subject: [PATCH 2/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-generic-deriving revision:10, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-generic-deriving?expand=0&rev=60 --- ghc-generic-deriving.changes | 2 +- ghc-generic-deriving.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-generic-deriving.changes b/ghc-generic-deriving.changes index 129ec29..4bd8d1b 100644 --- a/ghc-generic-deriving.changes +++ b/ghc-generic-deriving.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 Oct 6 08:55:51 UTC 2020 - psimons@suse.com diff --git a/ghc-generic-deriving.spec b/ghc-generic-deriving.spec index b9c875b..d6b8cef 100644 --- a/ghc-generic-deriving.spec +++ b/ghc-generic-deriving.spec @@ -30,12 +30,7 @@ BuildRequires: ghc-containers-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-template-haskell-devel BuildRequires: ghc-th-abstraction-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-hspec-devel %endif From 1d191bf012701acbec4cf1a5e39e77fe0104b6764620ecf24831ba8ffcf961ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:28:36 +0000 Subject: [PATCH 3/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-generic-deriving revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-generic-deriving?expand=0&rev=61 --- ghc-generic-deriving.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-generic-deriving.changes b/ghc-generic-deriving.changes index 4bd8d1b..e8944a9 100644 --- a/ghc-generic-deriving.changes +++ b/ghc-generic-deriving.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