From a0cba5092516e1f206ac4ed357e18e28bd2a462e78df4e16a9d1508a0da441a7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:03:54 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-mime-types revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-mime-types?expand=0&rev=46 --- ghc-mime-types.changes | 10 ---------- ghc-mime-types.spec | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/ghc-mime-types.changes b/ghc-mime-types.changes index 1d4a8ce..9e4f9be 100644 --- a/ghc-mime-types.changes +++ b/ghc-mime-types.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 18 10:45:28 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Jun 16 11:14:21 UTC 2020 - Peter Simons - -- Re-generate file with latest version of spec-cleaner. - ------------------------------------------------------------------- Fri Nov 8 16:14:13 UTC 2019 - Peter Simons diff --git a/ghc-mime-types.spec b/ghc-mime-types.spec index e0eb9e0..1e3bbcf 100644 --- a/ghc-mime-types.spec +++ b/ghc-mime-types.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-mime-types # -# 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 460015ac19c0033a6c37d278f665fed5738b4fbd99a1c654ea8c37e2b77282db Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:11:09 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-mime-types revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-mime-types?expand=0&rev=47 --- ghc-mime-types.changes | 10 ++++++++++ ghc-mime-types.spec | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ghc-mime-types.changes b/ghc-mime-types.changes index 9e4f9be..1d4a8ce 100644 --- a/ghc-mime-types.changes +++ b/ghc-mime-types.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Aug 18 10:45:28 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Tue Jun 16 11:14:21 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + ------------------------------------------------------------------- Fri Nov 8 16:14:13 UTC 2019 - Peter Simons diff --git a/ghc-mime-types.spec b/ghc-mime-types.spec index 1e3bbcf..e0eb9e0 100644 --- a/ghc-mime-types.spec +++ b/ghc-mime-types.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-mime-types # -# 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 1538e99dd9ff0c2c7028e99b33b635cbb9a9c9ddfd9c314b5135e072baa1a84d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:35 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-mime-types revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-mime-types?expand=0&rev=48 --- ghc-mime-types.changes | 5 +++++ ghc-mime-types.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-mime-types.changes b/ghc-mime-types.changes index 1d4a8ce..361345b 100644 --- a/ghc-mime-types.changes +++ b/ghc-mime-types.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:28 UTC 2020 - Peter Simons diff --git a/ghc-mime-types.spec b/ghc-mime-types.spec index e0eb9e0..50581bf 100644 --- a/ghc-mime-types.spec +++ b/ghc-mime-types.spec @@ -29,6 +29,12 @@ BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-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 %description API docs and the README are available at From ee1ab10bb37f82d2cd38aebc4c8bc73abfd5a5dd4d0709599ccbd58edee67a4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:48:44 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-mime-types revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-mime-types?expand=0&rev=49 --- ghc-mime-types.changes | 2 +- ghc-mime-types.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-mime-types.changes b/ghc-mime-types.changes index 361345b..871b5a4 100644 --- a/ghc-mime-types.changes +++ b/ghc-mime-types.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:28 UTC 2020 - Peter Simons diff --git a/ghc-mime-types.spec b/ghc-mime-types.spec index 50581bf..5bc1cc0 100644 --- a/ghc-mime-types.spec +++ b/ghc-mime-types.spec @@ -29,12 +29,7 @@ BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-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} %description API docs and the README are available at From c3c76e9fe86949c03c6e575b70b0d94eb43ec9c67997e222176402da927895c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:28:59 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-mime-types revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-mime-types?expand=0&rev=50 --- ghc-mime-types.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-mime-types.changes b/ghc-mime-types.changes index 871b5a4..3ef3aa8 100644 --- a/ghc-mime-types.changes +++ b/ghc-mime-types.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