From 739fecc893d45da9796893f790fac86a1e2482fc71d517e93680409608ef93b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:10 +0000 Subject: [PATCH 1/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-ghc-paths revision:3, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-ghc-paths?expand=0&rev=3 --- ghc-ghc-paths.changes | 5 +++++ ghc-ghc-paths.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-ghc-paths.changes b/ghc-ghc-paths.changes index 8178bc3..4b92802 100644 --- a/ghc-ghc-paths.changes +++ b/ghc-ghc-paths.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + ------------------------------------------------------------------- Tue Sep 1 10:38:24 UTC 2020 - psimons@suse.com diff --git a/ghc-ghc-paths.spec b/ghc-ghc-paths.spec index 52d9d6b..9e26fb8 100644 --- a/ghc-ghc-paths.spec +++ b/ghc-ghc-paths.spec @@ -28,6 +28,12 @@ Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revis BuildRequires: ghc-Cabal-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-rpm-macros +# 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 %description Knowledge of GHC's installation directories. From 5228f069e7f8f41ad31a83cd9680e15794785841aa2c73216a4bb2995e873e93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:48:07 +0000 Subject: [PATCH 2/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-ghc-paths revision:5, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-ghc-paths?expand=0&rev=4 --- ghc-ghc-paths.changes | 2 +- ghc-ghc-paths.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-ghc-paths.changes b/ghc-ghc-paths.changes index 4b92802..1e4777a 100644 --- a/ghc-ghc-paths.changes +++ b/ghc-ghc-paths.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 Sep 1 10:38:24 UTC 2020 - psimons@suse.com diff --git a/ghc-ghc-paths.spec b/ghc-ghc-paths.spec index 9e26fb8..0e520b7 100644 --- a/ghc-ghc-paths.spec +++ b/ghc-ghc-paths.spec @@ -28,12 +28,7 @@ Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revis BuildRequires: ghc-Cabal-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-rpm-macros -# 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} %description Knowledge of GHC's installation directories. From da82e584c8a2716364ae81e07c4a7fb08a22bbb48aa7be4af2ed5ee1c8bab248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:28:37 +0000 Subject: [PATCH 3/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-ghc-paths revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-ghc-paths?expand=0&rev=5 --- ghc-ghc-paths.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-ghc-paths.changes b/ghc-ghc-paths.changes index 1e4777a..e1da5a8 100644 --- a/ghc-ghc-paths.changes +++ b/ghc-ghc-paths.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