From 5b959685a80f82bcbf7c1fe2c80cddd0b0c0c1e7694b579e258e20725b1ae779 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:03:25 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-hourglass revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hourglass?expand=0&rev=39 --- ghc-hourglass.changes | 10 ---------- ghc-hourglass.spec | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/ghc-hourglass.changes b/ghc-hourglass.changes index a7f30af..b10bd6f 100644 --- a/ghc-hourglass.changes +++ b/ghc-hourglass.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 18 10:45:02 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Jun 16 11:14:10 UTC 2020 - Peter Simons - -- Re-generate file with latest version of spec-cleaner. - ------------------------------------------------------------------- Fri Nov 8 16:13:51 UTC 2019 - Peter Simons diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index ae894d2..f765eae 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-hourglass # -# 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 @@ -56,7 +56,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 8762987dd5bc75845d754073156ec0fc5eab92cccffdbaefa1ca7ca99f14d3e2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:10:38 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-hourglass revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hourglass?expand=0&rev=40 --- ghc-hourglass.changes | 10 ++++++++++ ghc-hourglass.spec | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ghc-hourglass.changes b/ghc-hourglass.changes index b10bd6f..a7f30af 100644 --- a/ghc-hourglass.changes +++ b/ghc-hourglass.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Aug 18 10:45:02 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Tue Jun 16 11:14:10 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + ------------------------------------------------------------------- Fri Nov 8 16:13:51 UTC 2019 - Peter Simons diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index f765eae..ae894d2 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-hourglass # -# 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 @@ -56,7 +56,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 c83b9b911f80c0c6ca9b14f943d3437fe4f7831bd8961104f54341b8186a52cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:14 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-hourglass revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hourglass?expand=0&rev=41 --- ghc-hourglass.changes | 5 +++++ ghc-hourglass.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-hourglass.changes b/ghc-hourglass.changes index a7f30af..8cf529f 100644 --- a/ghc-hourglass.changes +++ b/ghc-hourglass.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:45:02 UTC 2020 - Peter Simons diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index ae894d2..c3f8fbc 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.spec @@ -28,6 +28,12 @@ Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg BuildRequires: ghc-Cabal-devel BuildRequires: ghc-deepseq-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-mtl-devel BuildRequires: ghc-old-locale-devel From 7db5aed149ec491d09b1c0518a3e2104c3c27b9a6e2fbb2d4f6fa96a2fd06f00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:48:11 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-hourglass revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hourglass?expand=0&rev=42 --- ghc-hourglass.changes | 2 +- ghc-hourglass.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-hourglass.changes b/ghc-hourglass.changes index 8cf529f..278f357 100644 --- a/ghc-hourglass.changes +++ b/ghc-hourglass.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:45:02 UTC 2020 - Peter Simons diff --git a/ghc-hourglass.spec b/ghc-hourglass.spec index c3f8fbc..f4a3007 100644 --- a/ghc-hourglass.spec +++ b/ghc-hourglass.spec @@ -28,12 +28,7 @@ Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg BuildRequires: ghc-Cabal-devel BuildRequires: ghc-deepseq-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-mtl-devel BuildRequires: ghc-old-locale-devel From 0890e805272fda22781c4cb52681072f06463f6da5609a70f333ec2529ea141f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:28:40 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-hourglass revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hourglass?expand=0&rev=43 --- ghc-hourglass.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-hourglass.changes b/ghc-hourglass.changes index 278f357..d1b035c 100644 --- a/ghc-hourglass.changes +++ b/ghc-hourglass.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