From 5f89af4366ce7d09d635f17db50e957ad751883067e6a32f394c78a5dcf3c0d5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:02:57 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-SHA revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-SHA?expand=0&rev=36 --- ghc-SHA.changes | 10 ---------- ghc-SHA.spec | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/ghc-SHA.changes b/ghc-SHA.changes index 1faa670..4875304 100644 --- a/ghc-SHA.changes +++ b/ghc-SHA.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 18 10:43:52 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Jun 16 11:13:39 UTC 2020 - Peter Simons - -- Re-generate file with latest version of spec-cleaner. - ------------------------------------------------------------------- Fri Nov 8 16:14:44 UTC 2019 - Peter Simons diff --git a/ghc-SHA.spec b/ghc-SHA.spec index e40cb3c..1238300 100644 --- a/ghc-SHA.spec +++ b/ghc-SHA.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-SHA # -# 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 @@ -55,7 +55,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 8a162d553d22a461fa0094e88e5229f5f65239c8c0b627ecedd298b2677d5237 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:09:57 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-SHA revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-SHA?expand=0&rev=38 --- ghc-SHA.changes | 10 ++++++++++ ghc-SHA.spec | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ghc-SHA.changes b/ghc-SHA.changes index 4875304..1faa670 100644 --- a/ghc-SHA.changes +++ b/ghc-SHA.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Aug 18 10:43:52 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Tue Jun 16 11:13:39 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + ------------------------------------------------------------------- Fri Nov 8 16:14:44 UTC 2019 - Peter Simons diff --git a/ghc-SHA.spec b/ghc-SHA.spec index 1238300..e40cb3c 100644 --- a/ghc-SHA.spec +++ b/ghc-SHA.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-SHA # -# 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 @@ -55,7 +55,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 cbf47643ce7828822f9f19067f233c7bb9f6f084f850d9d53ef073f55bd2baa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:51:32 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-SHA revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-SHA?expand=0&rev=39 --- ghc-SHA.changes | 5 +++++ ghc-SHA.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-SHA.changes b/ghc-SHA.changes index 1faa670..034e346 100644 --- a/ghc-SHA.changes +++ b/ghc-SHA.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:43:52 UTC 2020 - Peter Simons diff --git a/ghc-SHA.spec b/ghc-SHA.spec index e40cb3c..8df7a5a 100644 --- a/ghc-SHA.spec +++ b/ghc-SHA.spec @@ -30,6 +30,12 @@ BuildRequires: ghc-array-devel BuildRequires: ghc-binary-devel BuildRequires: ghc-bytestring-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 BuildRequires: ghc-test-framework-devel From e7ebe99d6e1a00067bec03d9319f52b0c6a456fc56c7c77ef90928d71f153207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:47:30 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-SHA revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-SHA?expand=0&rev=40 --- ghc-SHA.changes | 2 +- ghc-SHA.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-SHA.changes b/ghc-SHA.changes index 034e346..8b5ea12 100644 --- a/ghc-SHA.changes +++ b/ghc-SHA.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:43:52 UTC 2020 - Peter Simons diff --git a/ghc-SHA.spec b/ghc-SHA.spec index 8df7a5a..ac8cdb0 100644 --- a/ghc-SHA.spec +++ b/ghc-SHA.spec @@ -30,12 +30,7 @@ BuildRequires: ghc-array-devel BuildRequires: ghc-binary-devel BuildRequires: ghc-bytestring-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 BuildRequires: ghc-test-framework-devel From a69e67b8c1c54ac66a01e7755102ccde91dcb4e09723ab44c1c5b12b4c9739bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:27:53 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-SHA revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-SHA?expand=0&rev=41 --- ghc-SHA.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-SHA.changes b/ghc-SHA.changes index 8b5ea12..6ba768c 100644 --- a/ghc-SHA.changes +++ b/ghc-SHA.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