From 0c3b6fcda3ffa2d220a18b13ada8223ea49d241bc8309b0ff43c64c35a89a0c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:04:16 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-socks revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-socks?expand=0&rev=48 --- ghc-socks.changes | 10 ---------- ghc-socks.spec | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/ghc-socks.changes b/ghc-socks.changes index e7021cf..781e2b1 100644 --- a/ghc-socks.changes +++ b/ghc-socks.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 18 10:46:04 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Jun 16 11:14:36 UTC 2020 - Peter Simons - -- Re-generate file with latest version of spec-cleaner. - ------------------------------------------------------------------- Fri Nov 8 16:14:47 UTC 2019 - Peter Simons diff --git a/ghc-socks.spec b/ghc-socks.spec index 4334b08..01c96a8 100644 --- a/ghc-socks.spec +++ b/ghc-socks.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-socks # -# 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 e2ac0bd74fe4cd1d9c04fe17a08dafc8df9537c6f1ca3ea86b69f80e01e047ab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:11:37 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-socks revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-socks?expand=0&rev=49 --- ghc-socks.changes | 10 ++++++++++ ghc-socks.spec | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ghc-socks.changes b/ghc-socks.changes index 781e2b1..e7021cf 100644 --- a/ghc-socks.changes +++ b/ghc-socks.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Aug 18 10:46:04 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Tue Jun 16 11:14:36 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + ------------------------------------------------------------------- Fri Nov 8 16:14:47 UTC 2019 - Peter Simons diff --git a/ghc-socks.spec b/ghc-socks.spec index 01c96a8..4334b08 100644 --- a/ghc-socks.spec +++ b/ghc-socks.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-socks # -# 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 0f0d3c9ee7bf5d41ed9bc3dbc93520051c7c2d18855cde50236e297a7f30654e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:59 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-socks revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-socks?expand=0&rev=50 --- ghc-socks.changes | 5 +++++ ghc-socks.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-socks.changes b/ghc-socks.changes index e7021cf..87bc671 100644 --- a/ghc-socks.changes +++ b/ghc-socks.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:46:04 UTC 2020 - Peter Simons diff --git a/ghc-socks.spec b/ghc-socks.spec index 4334b08..a2f8a9b 100644 --- a/ghc-socks.spec +++ b/ghc-socks.spec @@ -30,6 +30,12 @@ BuildRequires: ghc-bytestring-devel BuildRequires: ghc-cereal-devel BuildRequires: ghc-network-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 Socks proxy (version 5) implementation. From ec30985db1c909ee134a8676fba4baa1ae8e5b2af56c515d777ea7f8b617ac9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:49:11 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-socks revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-socks?expand=0&rev=51 --- ghc-socks.changes | 2 +- ghc-socks.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-socks.changes b/ghc-socks.changes index 87bc671..10a1dc7 100644 --- a/ghc-socks.changes +++ b/ghc-socks.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:46:04 UTC 2020 - Peter Simons diff --git a/ghc-socks.spec b/ghc-socks.spec index a2f8a9b..1f75e1a 100644 --- a/ghc-socks.spec +++ b/ghc-socks.spec @@ -30,12 +30,7 @@ BuildRequires: ghc-bytestring-devel BuildRequires: ghc-cereal-devel BuildRequires: ghc-network-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 Socks proxy (version 5) implementation. From 75c2544d9349185a8108e753b696bed710c0bde8522249b9e9e7f2115713df2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:29:21 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-socks revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-socks?expand=0&rev=52 --- ghc-socks.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-socks.changes b/ghc-socks.changes index 10a1dc7..fa227c6 100644 --- a/ghc-socks.changes +++ b/ghc-socks.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