From 3f144611a446eaab3d3eb6812b8e6148e888565db6f6f3eac7ac89b475226bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:53:23 +0000 Subject: [PATCH 1/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-zip-archive revision:10, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-zip-archive?expand=0&rev=70 --- ghc-zip-archive.changes | 5 +++++ ghc-zip-archive.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-zip-archive.changes b/ghc-zip-archive.changes index 5da0c7b..f32fd3b 100644 --- a/ghc-zip-archive.changes +++ b/ghc-zip-archive.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + ------------------------------------------------------------------- Mon Aug 31 09:34:34 UTC 2020 - psimons@suse.com diff --git a/ghc-zip-archive.spec b/ghc-zip-archive.spec index 59f3914..d904b04 100644 --- a/ghc-zip-archive.spec +++ b/ghc-zip-archive.spec @@ -41,6 +41,12 @@ BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel BuildRequires: ghc-unix-devel BuildRequires: ghc-zlib-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-HUnit-devel BuildRequires: ghc-process-devel From d3bf9066b902b9dbe84b3557c35c149646531b6af6d74f80f7681b5ac6a92fea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:49:40 +0000 Subject: [PATCH 2/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-zip-archive revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-zip-archive?expand=0&rev=71 --- ghc-zip-archive.changes | 2 +- ghc-zip-archive.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-zip-archive.changes b/ghc-zip-archive.changes index f32fd3b..535fff0 100644 --- a/ghc-zip-archive.changes +++ b/ghc-zip-archive.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 ------------------------------------------------------------------- Mon Aug 31 09:34:34 UTC 2020 - psimons@suse.com diff --git a/ghc-zip-archive.spec b/ghc-zip-archive.spec index d904b04..5ed42d7 100644 --- a/ghc-zip-archive.spec +++ b/ghc-zip-archive.spec @@ -41,12 +41,7 @@ BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel BuildRequires: ghc-unix-devel BuildRequires: ghc-zlib-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-HUnit-devel BuildRequires: ghc-process-devel From f04ac16385fac8bf5f746f8508af399ea29924c11771126fd84d51aaa4b4d8c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:29:45 +0000 Subject: [PATCH 3/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-zip-archive revision:13, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-zip-archive?expand=0&rev=72 --- ghc-zip-archive.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-zip-archive.changes b/ghc-zip-archive.changes index 535fff0..c6bc364 100644 --- a/ghc-zip-archive.changes +++ b/ghc-zip-archive.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