From b0e0e006e3478a6d05bc32e7466ed23b80a11ca9e4f0f879cade93e258287ffe 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-cookie revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-cookie?expand=0&rev=46 --- ghc-cookie.changes | 10 ---------- ghc-cookie.spec | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/ghc-cookie.changes b/ghc-cookie.changes index 6d0eec0..430c74c 100644 --- a/ghc-cookie.changes +++ b/ghc-cookie.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 18 10:44:27 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Jun 16 11:13:57 UTC 2020 - Peter Simons - -- Re-generate file with latest version of spec-cleaner. - ------------------------------------------------------------------- Tue Nov 12 09:57:04 UTC 2019 - psimons@suse.com diff --git a/ghc-cookie.spec b/ghc-cookie.spec index d4fbf09..6807805 100644 --- a/ghc-cookie.spec +++ b/ghc-cookie.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-cookie # -# 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 @@ -55,7 +55,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 1e73f35d77f90232f626e91db822217dfa817a238756a57e39c6beef248e04ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:10:17 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-cookie revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-cookie?expand=0&rev=47 --- ghc-cookie.changes | 10 ++++++++++ ghc-cookie.spec | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ghc-cookie.changes b/ghc-cookie.changes index 430c74c..6d0eec0 100644 --- a/ghc-cookie.changes +++ b/ghc-cookie.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Aug 18 10:44:27 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Tue Jun 16 11:13:57 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + ------------------------------------------------------------------- Tue Nov 12 09:57:04 UTC 2019 - psimons@suse.com diff --git a/ghc-cookie.spec b/ghc-cookie.spec index 6807805..d4fbf09 100644 --- a/ghc-cookie.spec +++ b/ghc-cookie.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-cookie # -# 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 @@ -55,7 +55,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 b7582310703ab4a4d2fe3a6478709e735d638e826961383d12e320e9def4d65f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:51:53 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-cookie revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-cookie?expand=0&rev=48 --- ghc-cookie.changes | 5 +++++ ghc-cookie.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-cookie.changes b/ghc-cookie.changes index 6d0eec0..3b7ec15 100644 --- a/ghc-cookie.changes +++ b/ghc-cookie.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:27 UTC 2020 - Peter Simons diff --git a/ghc-cookie.spec b/ghc-cookie.spec index d4fbf09..0ff4f80 100644 --- a/ghc-cookie.spec +++ b/ghc-cookie.spec @@ -32,6 +32,12 @@ BuildRequires: ghc-deepseq-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-devel BuildRequires: ghc-time-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-HUnit-devel BuildRequires: ghc-QuickCheck-devel From 9bd6c875a460c5efecce65b4af84627d849e494d246b5ebcc49ecc4e28ba5346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:47:52 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-cookie revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-cookie?expand=0&rev=49 --- ghc-cookie.changes | 2 +- ghc-cookie.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-cookie.changes b/ghc-cookie.changes index 3b7ec15..537490a 100644 --- a/ghc-cookie.changes +++ b/ghc-cookie.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:27 UTC 2020 - Peter Simons diff --git a/ghc-cookie.spec b/ghc-cookie.spec index 0ff4f80..7388c99 100644 --- a/ghc-cookie.spec +++ b/ghc-cookie.spec @@ -32,12 +32,7 @@ BuildRequires: ghc-deepseq-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-devel BuildRequires: ghc-time-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-HUnit-devel BuildRequires: ghc-QuickCheck-devel From e3bf05f43abf834c48de5cc43ab223384ddb672dd87997eb8afd4b1c03e921d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:28:20 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-cookie revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-cookie?expand=0&rev=50 --- ghc-cookie.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-cookie.changes b/ghc-cookie.changes index 537490a..fe3f24d 100644 --- a/ghc-cookie.changes +++ b/ghc-cookie.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