From 0ec8c47981178226eda1e1edf154445e43fcc3fdd91f63c878b572ed1bfbac24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:12 +0000 Subject: [PATCH 1/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-haskell-lexer revision:5, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-haskell-lexer?expand=0&rev=5 --- ghc-haskell-lexer.changes | 5 +++++ ghc-haskell-lexer.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-haskell-lexer.changes b/ghc-haskell-lexer.changes index b1ca1ee..c808cd7 100644 --- a/ghc-haskell-lexer.changes +++ b/ghc-haskell-lexer.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + ------------------------------------------------------------------- Tue Aug 18 10:44:59 UTC 2020 - Peter Simons diff --git a/ghc-haskell-lexer.spec b/ghc-haskell-lexer.spec index d45c1a0..f2a5c16 100644 --- a/ghc-haskell-lexer.spec +++ b/ghc-haskell-lexer.spec @@ -26,6 +26,12 @@ URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-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 A fully compliant Haskell 98 lexer. From 329bb251deda6b2528fca9b22618eed673c4b49637e1fc91b94a42b06fb9b76d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:48:10 +0000 Subject: [PATCH 2/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-haskell-lexer revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-haskell-lexer?expand=0&rev=6 --- ghc-haskell-lexer.changes | 2 +- ghc-haskell-lexer.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-haskell-lexer.changes b/ghc-haskell-lexer.changes index c808cd7..d9a8719 100644 --- a/ghc-haskell-lexer.changes +++ b/ghc-haskell-lexer.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 Aug 18 10:44:59 UTC 2020 - Peter Simons diff --git a/ghc-haskell-lexer.spec b/ghc-haskell-lexer.spec index f2a5c16..04a7798 100644 --- a/ghc-haskell-lexer.spec +++ b/ghc-haskell-lexer.spec @@ -26,12 +26,7 @@ URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-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 A fully compliant Haskell 98 lexer. From ae4d5f4b05f428b2b5d04472a4176f880205ee350f0670630b9b8c02a79111e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:28:39 +0000 Subject: [PATCH 3/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-haskell-lexer revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-haskell-lexer?expand=0&rev=7 --- ghc-haskell-lexer.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-haskell-lexer.changes b/ghc-haskell-lexer.changes index d9a8719..7361d96 100644 --- a/ghc-haskell-lexer.changes +++ b/ghc-haskell-lexer.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