From 3d8f91e94c5d16b56c21308ed8605560567b326c4ff21b3877b4747fe2960830 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:03:06 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-call-stack revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-call-stack?expand=0&rev=36 --- ghc-call-stack.changes | 10 ---------- ghc-call-stack.spec | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/ghc-call-stack.changes b/ghc-call-stack.changes index 4fa55da..e4f19c2 100644 --- a/ghc-call-stack.changes +++ b/ghc-call-stack.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 18 10:44:14 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Jun 16 11:13:51 UTC 2020 - Peter Simons - -- Re-generate file with latest version of spec-cleaner. - ------------------------------------------------------------------- Fri Nov 8 16:13:23 UTC 2019 - Peter Simons diff --git a/ghc-call-stack.spec b/ghc-call-stack.spec index 336ea0d..add4afe 100644 --- a/ghc-call-stack.spec +++ b/ghc-call-stack.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-call-stack # -# 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 @@ -45,7 +45,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 1816c0bd0148d6308ab2df3843ea518fc75e019b2ff66ea730b1721b3c96a458 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:10:11 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-call-stack revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-call-stack?expand=0&rev=37 --- ghc-call-stack.changes | 10 ++++++++++ ghc-call-stack.spec | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ghc-call-stack.changes b/ghc-call-stack.changes index e4f19c2..4fa55da 100644 --- a/ghc-call-stack.changes +++ b/ghc-call-stack.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Aug 18 10:44:14 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Tue Jun 16 11:13:51 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + ------------------------------------------------------------------- Fri Nov 8 16:13:23 UTC 2019 - Peter Simons diff --git a/ghc-call-stack.spec b/ghc-call-stack.spec index add4afe..336ea0d 100644 --- a/ghc-call-stack.spec +++ b/ghc-call-stack.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-call-stack # -# 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 @@ -45,7 +45,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 29f84538be391d7a5d406dbc6a02258fc5f597c3be02071ec153af330245f176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:51:46 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-call-stack revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-call-stack?expand=0&rev=38 --- ghc-call-stack.changes | 5 +++++ ghc-call-stack.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-call-stack.changes b/ghc-call-stack.changes index 4fa55da..613d879 100644 --- a/ghc-call-stack.changes +++ b/ghc-call-stack.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:14 UTC 2020 - Peter Simons diff --git a/ghc-call-stack.spec b/ghc-call-stack.spec index 336ea0d..f9bfb9e 100644 --- a/ghc-call-stack.spec +++ b/ghc-call-stack.spec @@ -27,6 +27,12 @@ URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-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-nanospec-devel %endif From c585c17db51c4b5458c8a543c187efd54fad3274db59c453609148ae00ee6afe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:47:43 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-call-stack revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-call-stack?expand=0&rev=39 --- ghc-call-stack.changes | 2 +- ghc-call-stack.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-call-stack.changes b/ghc-call-stack.changes index 613d879..4f40600 100644 --- a/ghc-call-stack.changes +++ b/ghc-call-stack.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:14 UTC 2020 - Peter Simons diff --git a/ghc-call-stack.spec b/ghc-call-stack.spec index f9bfb9e..88e74dc 100644 --- a/ghc-call-stack.spec +++ b/ghc-call-stack.spec @@ -27,12 +27,7 @@ URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-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-nanospec-devel %endif From 997df238e84e3c3b87dec41d47ce7dd498d27d82d08972d836ff46892b48834e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:28:11 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-call-stack revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-call-stack?expand=0&rev=40 --- ghc-call-stack.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-call-stack.changes b/ghc-call-stack.changes index 4f40600..58ef771 100644 --- a/ghc-call-stack.changes +++ b/ghc-call-stack.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