From 96fd8f9d0e1079f711cbbb8e9edc205867d74944181cc8a8afee6fde746eaca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:06 +0000 Subject: [PATCH 1/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-filepattern revision:4, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-filepattern?expand=0&rev=5 --- ghc-filepattern.changes | 5 +++++ ghc-filepattern.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-filepattern.changes b/ghc-filepattern.changes index 1f72570..4a5b19b 100644 --- a/ghc-filepattern.changes +++ b/ghc-filepattern.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:52 UTC 2020 - Peter Simons diff --git a/ghc-filepattern.spec b/ghc-filepattern.spec index 86a3f77..20b0ac4 100644 --- a/ghc-filepattern.spec +++ b/ghc-filepattern.spec @@ -30,6 +30,12 @@ BuildRequires: ghc-directory-devel BuildRequires: ghc-extra-devel BuildRequires: ghc-filepath-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-QuickCheck-devel %endif From da852193c86e658029a7cfda39fd970e0b46c1bac8024f2f7102598bb500d161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:48:04 +0000 Subject: [PATCH 2/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-filepattern revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-filepattern?expand=0&rev=6 --- ghc-filepattern.changes | 2 +- ghc-filepattern.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-filepattern.changes b/ghc-filepattern.changes index 4a5b19b..1584837 100644 --- a/ghc-filepattern.changes +++ b/ghc-filepattern.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:52 UTC 2020 - Peter Simons diff --git a/ghc-filepattern.spec b/ghc-filepattern.spec index 20b0ac4..3ff1cae 100644 --- a/ghc-filepattern.spec +++ b/ghc-filepattern.spec @@ -30,12 +30,7 @@ BuildRequires: ghc-directory-devel BuildRequires: ghc-extra-devel BuildRequires: ghc-filepath-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-QuickCheck-devel %endif From 21c24c9a4c40a6a09f92cca1b42cbb25703cd2f89deb348e5d2ed537eeaff90a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:28:34 +0000 Subject: [PATCH 3/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-filepattern revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-filepattern?expand=0&rev=7 --- ghc-filepattern.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-filepattern.changes b/ghc-filepattern.changes index 1584837..2e057e6 100644 --- a/ghc-filepattern.changes +++ b/ghc-filepattern.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