From 48b617ccb70734b7d65d037310e8de1fed94f9cb19c0dbaabef554c10a8fbea4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:03:05 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-blaze-html revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-blaze-html?expand=0&rev=61 --- ghc-blaze-html.changes | 10 ---------- ghc-blaze-html.spec | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/ghc-blaze-html.changes b/ghc-blaze-html.changes index 730f7e2..94a5c36 100644 --- a/ghc-blaze-html.changes +++ b/ghc-blaze-html.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 18 10:44:10 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Jun 16 11:13:50 UTC 2020 - Peter Simons - -- Re-generate file with latest version of spec-cleaner. - ------------------------------------------------------------------- Fri Nov 8 16:13:21 UTC 2019 - Peter Simons diff --git a/ghc-blaze-html.spec b/ghc-blaze-html.spec index 896d428..16b1697 100644 --- a/ghc-blaze-html.spec +++ b/ghc-blaze-html.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-blaze-html # -# 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 @@ -56,7 +56,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 f78c49898b71c17c5ebe031e128f7ce216e19beb298ec0fab0307705984e357e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:10:09 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-blaze-html revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-blaze-html?expand=0&rev=62 --- ghc-blaze-html.changes | 10 ++++++++++ ghc-blaze-html.spec | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ghc-blaze-html.changes b/ghc-blaze-html.changes index 94a5c36..730f7e2 100644 --- a/ghc-blaze-html.changes +++ b/ghc-blaze-html.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Aug 18 10:44:10 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Tue Jun 16 11:13:50 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + ------------------------------------------------------------------- Fri Nov 8 16:13:21 UTC 2019 - Peter Simons diff --git a/ghc-blaze-html.spec b/ghc-blaze-html.spec index 16b1697..896d428 100644 --- a/ghc-blaze-html.spec +++ b/ghc-blaze-html.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-blaze-html # -# 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 @@ -56,7 +56,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 fd924da94218aabafdbb953dafa51939d285b5014790c514aafb1ada95196799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:51:44 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-blaze-html revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-blaze-html?expand=0&rev=63 --- ghc-blaze-html.changes | 5 +++++ ghc-blaze-html.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-blaze-html.changes b/ghc-blaze-html.changes index 730f7e2..bf3bb1b 100644 --- a/ghc-blaze-html.changes +++ b/ghc-blaze-html.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:10 UTC 2020 - Peter Simons diff --git a/ghc-blaze-html.spec b/ghc-blaze-html.spec index 896d428..cdc1014 100644 --- a/ghc-blaze-html.spec +++ b/ghc-blaze-html.spec @@ -31,6 +31,12 @@ BuildRequires: ghc-blaze-markup-devel BuildRequires: ghc-bytestring-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 %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel From be53e90128b516039f91842a1b17a6a63277128d1b922b0b6b87e44bbbe2bad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:47:41 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-blaze-html revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-blaze-html?expand=0&rev=64 --- ghc-blaze-html.changes | 2 +- ghc-blaze-html.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-blaze-html.changes b/ghc-blaze-html.changes index bf3bb1b..20408bb 100644 --- a/ghc-blaze-html.changes +++ b/ghc-blaze-html.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:10 UTC 2020 - Peter Simons diff --git a/ghc-blaze-html.spec b/ghc-blaze-html.spec index cdc1014..84e1e20 100644 --- a/ghc-blaze-html.spec +++ b/ghc-blaze-html.spec @@ -31,12 +31,7 @@ BuildRequires: ghc-blaze-markup-devel BuildRequires: ghc-bytestring-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} %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel From 01bdfca1c7b085a2095301cbac6634f34505f35524ef56a584766621c81012cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:28:08 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-blaze-html revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-blaze-html?expand=0&rev=65 --- ghc-blaze-html.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-blaze-html.changes b/ghc-blaze-html.changes index 20408bb..31acc97 100644 --- a/ghc-blaze-html.changes +++ b/ghc-blaze-html.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