From 7cd83a7da2af7cf2b0fafd74812cb0f086a12d586a5ab641cb717ca27d11c848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:13 +0000 Subject: [PATCH 1/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-hjsmin revision:5, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hjsmin?expand=0&rev=5 --- ghc-hjsmin.changes | 5 +++++ ghc-hjsmin.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-hjsmin.changes b/ghc-hjsmin.changes index f54823c..95ddf2f 100644 --- a/ghc-hjsmin.changes +++ b/ghc-hjsmin.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:00 UTC 2020 - Peter Simons diff --git a/ghc-hjsmin.spec b/ghc-hjsmin.spec index a0c048b..f95681e 100644 --- a/ghc-hjsmin.spec +++ b/ghc-hjsmin.spec @@ -31,6 +31,12 @@ BuildRequires: ghc-language-javascript-devel BuildRequires: ghc-optparse-applicative-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-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-directory-devel BuildRequires: ghc-extra-devel From 726ba39c46b2b592a45e985a0697411b31a73d8280868e7836329eacae887561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:48:11 +0000 Subject: [PATCH 2/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-hjsmin revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hjsmin?expand=0&rev=6 --- ghc-hjsmin.changes | 2 +- ghc-hjsmin.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-hjsmin.changes b/ghc-hjsmin.changes index 95ddf2f..7d0f96e 100644 --- a/ghc-hjsmin.changes +++ b/ghc-hjsmin.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:00 UTC 2020 - Peter Simons diff --git a/ghc-hjsmin.spec b/ghc-hjsmin.spec index f95681e..1e92e46 100644 --- a/ghc-hjsmin.spec +++ b/ghc-hjsmin.spec @@ -31,12 +31,7 @@ BuildRequires: ghc-language-javascript-devel BuildRequires: ghc-optparse-applicative-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-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-directory-devel BuildRequires: ghc-extra-devel From 8cc13ea53efaa60f1229097d8ac8e7141004fb8c985f917f2feaffa6d0d90b81 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-hjsmin revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hjsmin?expand=0&rev=7 --- ghc-hjsmin.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-hjsmin.changes b/ghc-hjsmin.changes index 7d0f96e..9d1fab7 100644 --- a/ghc-hjsmin.changes +++ b/ghc-hjsmin.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