From d7e27265a166866e27e179204f9fd4fb3d57c1fca11832db93d261da4f717df9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:03:24 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-hostname revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hostname?expand=0&rev=17 --- ghc-hostname.changes | 10 ---------- ghc-hostname.spec | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/ghc-hostname.changes b/ghc-hostname.changes index 1b5de14..8e81c69 100644 --- a/ghc-hostname.changes +++ b/ghc-hostname.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 18 10:45:01 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-hostname.spec b/ghc-hostname.spec index a944193..ed1d407 100644 --- a/ghc-hostname.spec +++ b/ghc-hostname.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-hostname # -# 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 @@ -42,7 +42,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 a70b66e17ff19fb25d6b8875663b851200d0bf5d24a7ba8123e47389db807813 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-hostname revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hostname?expand=0&rev=18 --- ghc-hostname.changes | 10 ++++++++++ ghc-hostname.spec | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ghc-hostname.changes b/ghc-hostname.changes index 8e81c69..1b5de14 100644 --- a/ghc-hostname.changes +++ b/ghc-hostname.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Aug 18 10:45:01 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-hostname.spec b/ghc-hostname.spec index ed1d407..a944193 100644 --- a/ghc-hostname.spec +++ b/ghc-hostname.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-hostname # -# 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 @@ -42,7 +42,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 c926ca3f8f95d4a469b06fd3d510c124b558aacacc58d163fae7f5180ae6189a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:13 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-hostname revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hostname?expand=0&rev=19 --- ghc-hostname.changes | 5 +++++ ghc-hostname.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-hostname.changes b/ghc-hostname.changes index 1b5de14..e7aeb18 100644 --- a/ghc-hostname.changes +++ b/ghc-hostname.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:01 UTC 2020 - Peter Simons diff --git a/ghc-hostname.spec b/ghc-hostname.spec index a944193..f23be40 100644 --- a/ghc-hostname.spec +++ b/ghc-hostname.spec @@ -26,6 +26,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 %description A very simple package providing a cross-platform means of determining the From 4b39144a66302db2d96aa3d62995fc3ec85f2de3449a2427bbc995ce724f3441 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-hostname revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hostname?expand=0&rev=20 --- ghc-hostname.changes | 2 +- ghc-hostname.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-hostname.changes b/ghc-hostname.changes index e7aeb18..a76e151 100644 --- a/ghc-hostname.changes +++ b/ghc-hostname.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:01 UTC 2020 - Peter Simons diff --git a/ghc-hostname.spec b/ghc-hostname.spec index f23be40..60f3a4f 100644 --- a/ghc-hostname.spec +++ b/ghc-hostname.spec @@ -26,12 +26,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} %description A very simple package providing a cross-platform means of determining the From bcc6b6962c17580be07d34c397a06e38b13fe1e112f341976ca409a48bcc9f3c 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-hostname revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-hostname?expand=0&rev=21 --- ghc-hostname.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-hostname.changes b/ghc-hostname.changes index a76e151..dc18c68 100644 --- a/ghc-hostname.changes +++ b/ghc-hostname.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