From 3da44e3ad8ce6d8d16581948f39ba57613ae78a73edb632c03dae2903fd02fff Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:03:18 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-errors revision:1, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-errors?expand=0&rev=11 --- ghc-errors.changes | 10 ---------- ghc-errors.spec | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/ghc-errors.changes b/ghc-errors.changes index 7711bce..9f306ac 100644 --- a/ghc-errors.changes +++ b/ghc-errors.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 18 10:44:47 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Jun 16 11:14:06 UTC 2020 - Peter Simons - -- Re-generate file with latest version of spec-cleaner. - ------------------------------------------------------------------- Mon Dec 23 14:08:10 UTC 2019 - psimons@suse.com diff --git a/ghc-errors.spec b/ghc-errors.spec index aab586b..62fb7d9 100644 --- a/ghc-errors.spec +++ b/ghc-errors.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-errors # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -50,7 +50,7 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%autosetup -n %{pkg_name}-%{version} +%setup -q -n %{pkg_name}-%{version} %build %ghc_lib_build From a423b7bb2f19e1efc89909eb0d8ec52179ece00eef076ff044901ac90af9ba4c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:10:29 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-errors revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-errors?expand=0&rev=12 --- ghc-errors.changes | 10 ++++++++++ ghc-errors.spec | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ghc-errors.changes b/ghc-errors.changes index 9f306ac..7711bce 100644 --- a/ghc-errors.changes +++ b/ghc-errors.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Aug 18 10:44:47 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Tue Jun 16 11:14:06 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + ------------------------------------------------------------------- Mon Dec 23 14:08:10 UTC 2019 - psimons@suse.com diff --git a/ghc-errors.spec b/ghc-errors.spec index 62fb7d9..aab586b 100644 --- a/ghc-errors.spec +++ b/ghc-errors.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-errors # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -50,7 +50,7 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} +%autosetup -n %{pkg_name}-%{version} %build %ghc_lib_build From 5f0dc93c12441906f7fa488944a0df8ea028fbbecd4925a6d17366972a3cfed9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:04 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-errors revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-errors?expand=0&rev=13 --- ghc-errors.changes | 5 +++++ ghc-errors.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-errors.changes b/ghc-errors.changes index 7711bce..1002a0e 100644 --- a/ghc-errors.changes +++ b/ghc-errors.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:47 UTC 2020 - Peter Simons diff --git a/ghc-errors.spec b/ghc-errors.spec index aab586b..1dc79ac 100644 --- a/ghc-errors.spec +++ b/ghc-errors.spec @@ -31,6 +31,12 @@ BuildRequires: ghc-safe-devel BuildRequires: ghc-text-devel BuildRequires: ghc-transformers-compat-devel BuildRequires: ghc-transformers-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 %description The one-stop shop for all your error-handling needs! Just import From ec2d83d4cf0e51a1ba17fa8f8b70cfcb0c6d47f75986f4268ece35abddf0f7f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:48:01 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-errors revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-errors?expand=0&rev=14 --- ghc-errors.changes | 2 +- ghc-errors.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-errors.changes b/ghc-errors.changes index 1002a0e..c8e9960 100644 --- a/ghc-errors.changes +++ b/ghc-errors.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:47 UTC 2020 - Peter Simons diff --git a/ghc-errors.spec b/ghc-errors.spec index 1dc79ac..55e01b9 100644 --- a/ghc-errors.spec +++ b/ghc-errors.spec @@ -31,12 +31,7 @@ BuildRequires: ghc-safe-devel BuildRequires: ghc-text-devel BuildRequires: ghc-transformers-compat-devel BuildRequires: ghc-transformers-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} %description The one-stop shop for all your error-handling needs! Just import From f2e4f446e0fb49e8942caffcc16c178c4395826172f357bc09d043dab5852c82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:28:31 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-errors revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-errors?expand=0&rev=15 --- ghc-errors.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-errors.changes b/ghc-errors.changes index c8e9960..cf3391a 100644 --- a/ghc-errors.changes +++ b/ghc-errors.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