From f3289bbc020b830c363c8291f6ace52a21ebc50c8b283e1ca11e60a76edb0653 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:04:20 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-temporary revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-temporary?expand=0&rev=44 --- ghc-temporary.changes | 10 ---------- ghc-temporary.spec | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/ghc-temporary.changes b/ghc-temporary.changes index e7e825d..641b2e0 100644 --- a/ghc-temporary.changes +++ b/ghc-temporary.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 18 10:46:12 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Jun 16 11:14:41 UTC 2020 - Peter Simons - -- Re-generate file with latest version of spec-cleaner. - ------------------------------------------------------------------- Fri Nov 8 16:14:55 UTC 2019 - Peter Simons diff --git a/ghc-temporary.spec b/ghc-temporary.spec index dd09bc8..3cbfc79 100644 --- a/ghc-temporary.spec +++ b/ghc-temporary.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-temporary # -# 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 @@ -53,7 +53,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 07b1e243e976343ce24fdcc6ed9b56b214a425f028cf67debd55f76e25d65c8c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:11:42 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-temporary revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-temporary?expand=0&rev=45 --- ghc-temporary.changes | 10 ++++++++++ ghc-temporary.spec | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ghc-temporary.changes b/ghc-temporary.changes index 641b2e0..e7e825d 100644 --- a/ghc-temporary.changes +++ b/ghc-temporary.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Aug 18 10:46:12 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Tue Jun 16 11:14:41 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + ------------------------------------------------------------------- Fri Nov 8 16:14:55 UTC 2019 - Peter Simons diff --git a/ghc-temporary.spec b/ghc-temporary.spec index 3cbfc79..dd09bc8 100644 --- a/ghc-temporary.spec +++ b/ghc-temporary.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-temporary # -# 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 @@ -53,7 +53,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 64e3bfb9dfcc0fc64d0a9fa60a9f3a4ae495140e82c66a1c9299a94a4e27e3b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:53:04 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-temporary revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-temporary?expand=0&rev=46 --- ghc-temporary.changes | 5 +++++ ghc-temporary.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-temporary.changes b/ghc-temporary.changes index e7e825d..04c57fc 100644 --- a/ghc-temporary.changes +++ b/ghc-temporary.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:46:12 UTC 2020 - Peter Simons diff --git a/ghc-temporary.spec b/ghc-temporary.spec index dd09bc8..c5d5dfe 100644 --- a/ghc-temporary.spec +++ b/ghc-temporary.spec @@ -33,6 +33,12 @@ BuildRequires: ghc-random-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-transformers-devel BuildRequires: ghc-unix-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-base-compat-devel BuildRequires: ghc-tasty-devel From 2b892a8fa9e0ff47bdaae87d940ff511e7dac23fb7a8e9e16e5e7248d3ba854f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:49:18 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-temporary revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-temporary?expand=0&rev=47 --- ghc-temporary.changes | 2 +- ghc-temporary.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-temporary.changes b/ghc-temporary.changes index 04c57fc..8056775 100644 --- a/ghc-temporary.changes +++ b/ghc-temporary.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:46:12 UTC 2020 - Peter Simons diff --git a/ghc-temporary.spec b/ghc-temporary.spec index c5d5dfe..544b81e 100644 --- a/ghc-temporary.spec +++ b/ghc-temporary.spec @@ -33,12 +33,7 @@ BuildRequires: ghc-random-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-transformers-devel BuildRequires: ghc-unix-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-base-compat-devel BuildRequires: ghc-tasty-devel From 5673aace93355c3a0769d94c79112f400187d159d8305d6cd2c2cc6307fb2fa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:29:27 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-temporary revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-temporary?expand=0&rev=48 --- ghc-temporary.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-temporary.changes b/ghc-temporary.changes index 8056775..b1d6298 100644 --- a/ghc-temporary.changes +++ b/ghc-temporary.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