From c1695c3ea28560ce4fa5e03989d62705de6cc39889a7c619cea07f4b2910c761 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:04:06 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-reflection revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-reflection?expand=0&rev=20 --- ghc-reflection.changes | 14 -------------- ghc-reflection.spec | 7 +++---- reflection-2.1.5.tar.gz | 3 +++ reflection-2.1.6.tar.gz | 3 --- 4 files changed, 6 insertions(+), 21 deletions(-) create mode 100644 reflection-2.1.5.tar.gz delete mode 100644 reflection-2.1.6.tar.gz diff --git a/ghc-reflection.changes b/ghc-reflection.changes index f18a9e0..13323fc 100644 --- a/ghc-reflection.changes +++ b/ghc-reflection.changes @@ -1,17 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 18 10:45:50 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Tue Jun 9 09:10:57 UTC 2020 - psimons@suse.com - -- Update reflection to version 2.1.6. - # 2.1.6 [2020.05.16] - * Fix a bug in which `give` (and possibly `reify`, `reifyNat`, and - `reifySymbol`) could be unsoundly inlined by GHC 8.10 or older to produce - incorrect runtime results. - ------------------------------------------------------------------- Fri Nov 8 16:14:31 UTC 2019 - Peter Simons diff --git a/ghc-reflection.spec b/ghc-reflection.spec index aee177f..ab549f0 100644 --- a/ghc-reflection.spec +++ b/ghc-reflection.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-reflection # -# 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 @@ -19,7 +19,7 @@ %global pkg_name reflection %bcond_with tests Name: ghc-%{pkg_name} -Version: 2.1.6 +Version: 2.1.5 Release: 0 Summary: Reifies arbitrary terms into types that can be reflected back into terms License: BSD-3-Clause @@ -30,7 +30,6 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-template-haskell-devel %if %{with tests} BuildRequires: ghc-QuickCheck-devel -BuildRequires: ghc-containers-devel BuildRequires: ghc-hspec-devel %endif @@ -61,7 +60,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 diff --git a/reflection-2.1.5.tar.gz b/reflection-2.1.5.tar.gz new file mode 100644 index 0000000..cd14580 --- /dev/null +++ b/reflection-2.1.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:272ee9bffb722047067296a34f68d7450e3f6abfbe62eed02a9cef20ed212977 +size 19532 diff --git a/reflection-2.1.6.tar.gz b/reflection-2.1.6.tar.gz deleted file mode 100644 index b66048c..0000000 --- a/reflection-2.1.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf3e14917ebb329a53701a3cce0afe670f20037a0148dbfa5cbfa574ed6ba6cd -size 19976 From 9b89046ddb496fd5ea8769cead7db99a79020dd871ada373034cad111f33ef20 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:11:17 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-reflection revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-reflection?expand=0&rev=21 --- ghc-reflection.changes | 14 ++++++++++++++ ghc-reflection.spec | 7 ++++--- reflection-2.1.5.tar.gz | 3 --- reflection-2.1.6.tar.gz | 3 +++ 4 files changed, 21 insertions(+), 6 deletions(-) delete mode 100644 reflection-2.1.5.tar.gz create mode 100644 reflection-2.1.6.tar.gz diff --git a/ghc-reflection.changes b/ghc-reflection.changes index 13323fc..f18a9e0 100644 --- a/ghc-reflection.changes +++ b/ghc-reflection.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Aug 18 10:45:50 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Tue Jun 9 09:10:57 UTC 2020 - psimons@suse.com + +- Update reflection to version 2.1.6. + # 2.1.6 [2020.05.16] + * Fix a bug in which `give` (and possibly `reify`, `reifyNat`, and + `reifySymbol`) could be unsoundly inlined by GHC 8.10 or older to produce + incorrect runtime results. + ------------------------------------------------------------------- Fri Nov 8 16:14:31 UTC 2019 - Peter Simons diff --git a/ghc-reflection.spec b/ghc-reflection.spec index ab549f0..aee177f 100644 --- a/ghc-reflection.spec +++ b/ghc-reflection.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-reflection # -# 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 @@ -19,7 +19,7 @@ %global pkg_name reflection %bcond_with tests Name: ghc-%{pkg_name} -Version: 2.1.5 +Version: 2.1.6 Release: 0 Summary: Reifies arbitrary terms into types that can be reflected back into terms License: BSD-3-Clause @@ -30,6 +30,7 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-template-haskell-devel %if %{with tests} BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-containers-devel BuildRequires: ghc-hspec-devel %endif @@ -60,7 +61,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 diff --git a/reflection-2.1.5.tar.gz b/reflection-2.1.5.tar.gz deleted file mode 100644 index cd14580..0000000 --- a/reflection-2.1.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:272ee9bffb722047067296a34f68d7450e3f6abfbe62eed02a9cef20ed212977 -size 19532 diff --git a/reflection-2.1.6.tar.gz b/reflection-2.1.6.tar.gz new file mode 100644 index 0000000..b66048c --- /dev/null +++ b/reflection-2.1.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf3e14917ebb329a53701a3cce0afe670f20037a0148dbfa5cbfa574ed6ba6cd +size 19976 From 51680be7ae5fe466c9ec07df4ce53c7b1bea1d2f298dd4f24ebd564c7a684d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:49 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-reflection revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-reflection?expand=0&rev=22 --- ghc-reflection.changes | 5 +++++ ghc-reflection.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-reflection.changes b/ghc-reflection.changes index f18a9e0..d2326a5 100644 --- a/ghc-reflection.changes +++ b/ghc-reflection.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:50 UTC 2020 - Peter Simons diff --git a/ghc-reflection.spec b/ghc-reflection.spec index aee177f..70a6a9f 100644 --- a/ghc-reflection.spec +++ b/ghc-reflection.spec @@ -28,6 +28,12 @@ Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-template-haskell-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-QuickCheck-devel BuildRequires: ghc-containers-devel From 813534798e3f6f9090d0bf1639d45ea3f3ec21bb99012f8f55a6e4e6ef839e32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:49:01 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-reflection revision:10, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-reflection?expand=0&rev=23 --- ghc-reflection.changes | 2 +- ghc-reflection.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-reflection.changes b/ghc-reflection.changes index d2326a5..54980d8 100644 --- a/ghc-reflection.changes +++ b/ghc-reflection.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:50 UTC 2020 - Peter Simons diff --git a/ghc-reflection.spec b/ghc-reflection.spec index 70a6a9f..b84b745 100644 --- a/ghc-reflection.spec +++ b/ghc-reflection.spec @@ -28,12 +28,7 @@ Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-template-haskell-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-QuickCheck-devel BuildRequires: ghc-containers-devel From 6ea6660cb89b17ddfb9910c354211aba46945760f1aabafe8e09fdef5f4956c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:29:13 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-reflection revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-reflection?expand=0&rev=24 --- ghc-reflection.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-reflection.changes b/ghc-reflection.changes index 54980d8..335b997 100644 --- a/ghc-reflection.changes +++ b/ghc-reflection.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