From 3ccd1d1de23b49b77f6ecc1b9e6e75523e2f9bcef14df8048bb6ec5dfa523940 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:03:12 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-data-default revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-data-default?expand=0&rev=43 --- ghc-data-default.changes | 10 ---------- ghc-data-default.spec | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/ghc-data-default.changes b/ghc-data-default.changes index 265d3e6..b2b7bc6 100644 --- a/ghc-data-default.changes +++ b/ghc-data-default.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 18 10:44:34 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Jun 16 11:13:58 UTC 2020 - Peter Simons - -- Re-generate file with latest version of spec-cleaner. - ------------------------------------------------------------------- Fri Nov 8 16:13:33 UTC 2019 - Peter Simons diff --git a/ghc-data-default.spec b/ghc-data-default.spec index c048e26..43527e6 100644 --- a/ghc-data-default.spec +++ b/ghc-data-default.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-data-default # -# 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 6d325c96e8e255b6bcd07842efdafddd3f22d6590f4ef1c49c5dbd777398a936 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:10:21 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-data-default revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-data-default?expand=0&rev=44 --- ghc-data-default.changes | 10 ++++++++++ ghc-data-default.spec | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ghc-data-default.changes b/ghc-data-default.changes index b2b7bc6..265d3e6 100644 --- a/ghc-data-default.changes +++ b/ghc-data-default.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Aug 18 10:44:34 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Tue Jun 16 11:13:58 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + ------------------------------------------------------------------- Fri Nov 8 16:13:33 UTC 2019 - Peter Simons diff --git a/ghc-data-default.spec b/ghc-data-default.spec index 43527e6..c048e26 100644 --- a/ghc-data-default.spec +++ b/ghc-data-default.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-data-default # -# 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 c90f0d4b93dc29c55fd1a6bd539983c0eb9ded7f015319b687fa27ad2ddd9672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:51:56 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-data-default revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-data-default?expand=0&rev=45 --- ghc-data-default.changes | 5 +++++ ghc-data-default.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-data-default.changes b/ghc-data-default.changes index 265d3e6..33e9b02 100644 --- a/ghc-data-default.changes +++ b/ghc-data-default.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:34 UTC 2020 - Peter Simons diff --git a/ghc-data-default.spec b/ghc-data-default.spec index c048e26..ad51473 100644 --- a/ghc-data-default.spec +++ b/ghc-data-default.spec @@ -30,6 +30,12 @@ BuildRequires: ghc-data-default-instances-containers-devel BuildRequires: ghc-data-default-instances-dlist-devel BuildRequires: ghc-data-default-instances-old-locale-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 %description A class for types with a default value. From 68c753cc8f21dc907adf586f73b87567bee0aab3f64c6dd84b7b3d1c3d9f3be3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:47:55 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-data-default revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-data-default?expand=0&rev=46 --- ghc-data-default.changes | 2 +- ghc-data-default.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-data-default.changes b/ghc-data-default.changes index 33e9b02..9cea072 100644 --- a/ghc-data-default.changes +++ b/ghc-data-default.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:34 UTC 2020 - Peter Simons diff --git a/ghc-data-default.spec b/ghc-data-default.spec index ad51473..34ebcf8 100644 --- a/ghc-data-default.spec +++ b/ghc-data-default.spec @@ -30,12 +30,7 @@ BuildRequires: ghc-data-default-instances-containers-devel BuildRequires: ghc-data-default-instances-dlist-devel BuildRequires: ghc-data-default-instances-old-locale-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} %description A class for types with a default value. From 7a9e8e2ae8de883f4c5d1132ae52d994840c57b2d0f32b5ee13cd562580e1b96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:28:24 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-data-default revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-data-default?expand=0&rev=47 --- ghc-data-default.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-data-default.changes b/ghc-data-default.changes index 9cea072..733e895 100644 --- a/ghc-data-default.changes +++ b/ghc-data-default.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