From c7ea1fb1f2db793e24d1946fecd0c9fa697db08cacbe2e4f3a7602d599cf1eeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:39 +0000 Subject: [PATCH 1/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-network-info revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-network-info?expand=0&rev=7 --- ghc-network-info.changes | 5 +++++ ghc-network-info.spec | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ghc-network-info.changes b/ghc-network-info.changes index 4d5d768..ff61f18 100644 --- a/ghc-network-info.changes +++ b/ghc-network-info.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + ------------------------------------------------------------------- Mon Aug 31 09:34:36 UTC 2020 - psimons@suse.com diff --git a/ghc-network-info.spec b/ghc-network-info.spec index c848309..2949042 100644 --- a/ghc-network-info.spec +++ b/ghc-network-info.spec @@ -27,6 +27,12 @@ Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal 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 This library provides simple read-only access to the local computer's @@ -48,7 +54,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} cp -p %{SOURCE1} %{pkg_name}.cabal %build From aad867f1bc396ea4d1bbdf7609ee7c44aaec1204e74fdddb5b84f6f297228b99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:48:50 +0000 Subject: [PATCH 2/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-network-info revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-network-info?expand=0&rev=8 --- ghc-network-info.changes | 2 +- ghc-network-info.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-network-info.changes b/ghc-network-info.changes index ff61f18..e3fc01a 100644 --- a/ghc-network-info.changes +++ b/ghc-network-info.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 ------------------------------------------------------------------- Mon Aug 31 09:34:36 UTC 2020 - psimons@suse.com diff --git a/ghc-network-info.spec b/ghc-network-info.spec index 2949042..89660be 100644 --- a/ghc-network-info.spec +++ b/ghc-network-info.spec @@ -27,12 +27,7 @@ Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal 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 This library provides simple read-only access to the local computer's From 21dbe42436084dff3b0346c4afa05f8c007c3e2e9f7be620bbcb033bbbed2566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:29:03 +0000 Subject: [PATCH 3/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-network-info revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-network-info?expand=0&rev=9 --- ghc-network-info.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-network-info.changes b/ghc-network-info.changes index e3fc01a..9014927 100644 --- a/ghc-network-info.changes +++ b/ghc-network-info.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