From d8452ed35c2c357217b178014bb126d79bb3cbb1bb082ecdaf6aec085bc50083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:21 +0000 Subject: [PATCH 1/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-js-flot revision:4, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-js-flot?expand=0&rev=5 --- ghc-js-flot.changes | 5 +++++ ghc-js-flot.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-js-flot.changes b/ghc-js-flot.changes index 1182b4e..a95e015 100644 --- a/ghc-js-flot.changes +++ b/ghc-js-flot.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:45:16 UTC 2020 - Peter Simons diff --git a/ghc-js-flot.spec b/ghc-js-flot.spec index 295acb6..632b232 100644 --- a/ghc-js-flot.spec +++ b/ghc-js-flot.spec @@ -27,6 +27,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 %if %{with tests} BuildRequires: ghc-HTTP-devel %endif From b11db3ce8a7d932f5d75e2054e15ac0de864896d1b30401645c4cf63a8c53643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:48:20 +0000 Subject: [PATCH 2/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-js-flot revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-js-flot?expand=0&rev=6 --- ghc-js-flot.changes | 2 +- ghc-js-flot.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-js-flot.changes b/ghc-js-flot.changes index a95e015..5e34a26 100644 --- a/ghc-js-flot.changes +++ b/ghc-js-flot.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:45:16 UTC 2020 - Peter Simons diff --git a/ghc-js-flot.spec b/ghc-js-flot.spec index 632b232..b23ce8b 100644 --- a/ghc-js-flot.spec +++ b/ghc-js-flot.spec @@ -27,12 +27,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} %if %{with tests} BuildRequires: ghc-HTTP-devel %endif From d13dc91de429f38c49717fff678295870baa1b7ca62d1d5c6df6d24124517714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:28:48 +0000 Subject: [PATCH 3/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-js-flot revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-js-flot?expand=0&rev=7 --- ghc-js-flot.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-js-flot.changes b/ghc-js-flot.changes index 5e34a26..ef93faf 100644 --- a/ghc-js-flot.changes +++ b/ghc-js-flot.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