diff --git a/_constraints b/_constraints
index 70acc38..bff83ea 100644
--- a/_constraints
+++ b/_constraints
@@ -4,14 +4,4 @@
8
-
-
- riscv64
-
-
-
- 8
-
-
-
diff --git a/ghc-8.10.1-aarch64-unknown-linux.tar.xz b/ghc-8.10.1-aarch64-unknown-linux.tar.xz
deleted file mode 100644
index 57cc1d4..0000000
--- a/ghc-8.10.1-aarch64-unknown-linux.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:138a81ec916912668d24f8c444a21327d17a4469487d80f7a85878dadce7a0c8
-size 129565124
diff --git a/ghc-8.10.1-arm-unknown-linux.tar.xz b/ghc-8.10.1-arm-unknown-linux.tar.xz
deleted file mode 100644
index 89e0ae4..0000000
--- a/ghc-8.10.1-arm-unknown-linux.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d4f0ca1fa23563c16cbcf2a244c8e0e146cd712af49264af383e7adc2bef4168
-size 142578288
diff --git a/ghc-8.10.1-i386-unknown-linux.tar.xz b/ghc-8.10.1-i386-unknown-linux.tar.xz
deleted file mode 100644
index 2707e1d..0000000
--- a/ghc-8.10.1-i386-unknown-linux.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:74af326ca02c34e23978c9da455e4b35e8041960a6a4ebbba7cf4d763359b93a
-size 87289948
diff --git a/ghc-8.10.1-powerpc64-unknown-linux.tar.xz b/ghc-8.10.1-powerpc64-unknown-linux.tar.xz
deleted file mode 100644
index 3ad4288..0000000
--- a/ghc-8.10.1-powerpc64-unknown-linux.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f7b1e51fd02fec4ca8f657dda97476247292d7450d19505216b5bcf1c3470a8c
-size 120594748
diff --git a/ghc-8.10.1-powerpc64le-unknown-linux.tar.xz b/ghc-8.10.1-powerpc64le-unknown-linux.tar.xz
deleted file mode 100644
index 22608b5..0000000
--- a/ghc-8.10.1-powerpc64le-unknown-linux.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ff7c4c5011f6f7284a1bda4f51deb0b34afc9cd89cc001cf5935f4ba91af07cd
-size 123090680
diff --git a/ghc-8.10.1-riscv64-unknown-linux.tar.xz b/ghc-8.10.1-riscv64-unknown-linux.tar.xz
deleted file mode 100644
index fbd6e70..0000000
--- a/ghc-8.10.1-riscv64-unknown-linux.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:85a2c84563a1e27567b56e54be10aa42570127b1a5fdf889a280a671b398ab59
-size 150069944
diff --git a/ghc-8.10.1-x86_64-unknown-linux.tar.xz b/ghc-8.10.1-x86_64-unknown-linux.tar.xz
deleted file mode 100644
index 0808e51..0000000
--- a/ghc-8.10.1-x86_64-unknown-linux.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a1500173924bd2f463c77096712a516396aa9512b5f7511b2ccab71a39f8b645
-size 86007760
diff --git a/ghc-8.4.3-aarch64-unknown-linux.tar.xz b/ghc-8.4.3-aarch64-unknown-linux.tar.xz
new file mode 100644
index 0000000..e208ab0
--- /dev/null
+++ b/ghc-8.4.3-aarch64-unknown-linux.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dbdab66455a3766e549aa4b93c62fb24511b6a9c8fab48fded7ff1a5c6c08388
+size 106702404
diff --git a/ghc-8.4.3-arm-unknown-linux.tar.xz b/ghc-8.4.3-arm-unknown-linux.tar.xz
new file mode 100644
index 0000000..9ee649f
--- /dev/null
+++ b/ghc-8.4.3-arm-unknown-linux.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f39f02016aea5a4f4cc9d38947cd07b6be428957482a2e297b9e23abd8eef273
+size 113460520
diff --git a/ghc-8.4.3-i386-deb8-linux.tar.xz b/ghc-8.4.3-i386-deb8-linux.tar.xz
new file mode 100644
index 0000000..eb1a232
--- /dev/null
+++ b/ghc-8.4.3-i386-deb8-linux.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f5763983a26dedd88b65a0b17267359a3981b83a642569b26334423f684f8b8c
+size 147610164
diff --git a/ghc-8.4.3-powerpc64-unknown-linux.tar.xz b/ghc-8.4.3-powerpc64-unknown-linux.tar.xz
new file mode 100644
index 0000000..c07ce79
--- /dev/null
+++ b/ghc-8.4.3-powerpc64-unknown-linux.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:72b0be8846b433a8a65b3cd0d458f66b6d3c96d7266f5f217dbb2b3b544908aa
+size 106213456
diff --git a/ghc-8.4.3-powerpc64le-unknown-linux.tar.xz b/ghc-8.4.3-powerpc64le-unknown-linux.tar.xz
new file mode 100644
index 0000000..65d3db6
--- /dev/null
+++ b/ghc-8.4.3-powerpc64le-unknown-linux.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bf4549892f59042328773f673b07d78cef9b31a9da62eb3e816e17f2ee50ddef
+size 107090964
diff --git a/ghc-8.4.3-s390x-ibm-linux.tar.xz b/ghc-8.4.3-s390x-ibm-linux.tar.xz
new file mode 100644
index 0000000..bb44069
--- /dev/null
+++ b/ghc-8.4.3-s390x-ibm-linux.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c22419ade0714e20ddabd510ae28f6ad067480907b7d9b4f8c76474195577e2b
+size 115688600
diff --git a/ghc-8.4.3-x86_64-deb8-linux.tar.xz b/ghc-8.4.3-x86_64-deb8-linux.tar.xz
new file mode 100644
index 0000000..11f4f86
--- /dev/null
+++ b/ghc-8.4.3-x86_64-deb8-linux.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:30a402c6d4754a6c020e0547f19ae3ac42e907e35349aa932d347f73e421a8e2
+size 151870024
diff --git a/ghc-8.6.5-s390x-ibm-linux.tar.xz b/ghc-8.6.5-s390x-ibm-linux.tar.xz
deleted file mode 100644
index de8f792..0000000
--- a/ghc-8.6.5-s390x-ibm-linux.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5e0b5059968d94f2a2cd2a6061da15fde609abde61788a92d15ab963121c0920
-size 121581944
diff --git a/ghc-bootstrap.changes b/ghc-bootstrap.changes
index df17d6f..b3868ed 100644
--- a/ghc-bootstrap.changes
+++ b/ghc-bootstrap.changes
@@ -1,67 +1,3 @@
--------------------------------------------------------------------
-Sun May 31 20:51:10 UTC 2020 - Ondřej Súkup
-
-- update most archs to 8.10.1
-- clean-up spec
-
--------------------------------------------------------------------
-Thu May 21 11:48:31 UTC 2020 - Peter Trommler
-
-- Add numa-devel requirement
- * fixes ghc-bootstrap-helpers builds on ppc64, ppc64le
-
--------------------------------------------------------------------
-Sun May 17 11:26:43 UTC 2020 - Andreas Schwab
-
-- ghc-8.6.5-riscv64-unknown-linux.tar.xz: rebuilt with current libffi
-
--------------------------------------------------------------------
-Wed May 6 14:02:54 UTC 2020 - Peter Simons
-
-- Drop duplicated ix86 case from list of conditionals.
-
--------------------------------------------------------------------
-Tue Mar 10 20:33:07 UTC 2020 - Guillaume GARDET
-
-- Fix previous commit, do not require llvm6 for Tumbleweed
- since it has been dropped from Factory.
-
--------------------------------------------------------------------
-Tue Feb 4 08:50:52 UTC 2020 - Peter Trommler
-
-- Relax LLVM requirement on ARM and Aarch64
-
--------------------------------------------------------------------
-Mon Jan 27 15:04:30 UTC 2020 - Guillaume GARDET
-
-- Drop llvm6-devel requirement for ARM
-
--------------------------------------------------------------------
-Wed Jan 22 22:39:11 UTC 2020 - Andreas Schwab
-
-- Add support for riscv64
-
--------------------------------------------------------------------
-Fri Jan 17 19:00:28 UTC 2020 - Peter Trommler
-
-- Add requires tags
- * needed for ghc-bootstrap-helpers
-
--------------------------------------------------------------------
-Wed Jan 8 23:28:25 UTC 2020 - Andreas Schwab
-
-- Enable build on riscv64
-
--------------------------------------------------------------------
-Tue Nov 26 19:02:42 UTC 2019 - Peter Trommler
-
-- Add RISCV bindist taken from openSUSE:Factory:RISCV64
-
--------------------------------------------------------------------
-Mon Nov 25 19:23:46 UTC 2019 - Peter Trommler
-
-- Update to version 8.6.5 for GHC 8.10 bootstrap
-
-------------------------------------------------------------------
Thu Apr 11 18:48:41 UTC 2019 - psimons@suse.com
@@ -76,7 +12,7 @@ Thu Jan 10 08:56:18 UTC 2019 - ptrommler@icloud.com
- Install binary distribution in /opt
* avoid conflicts with package ghc
-* fixes an issue brought up in boo#1121052
+* fixes an issue brought up in boo#1121052
-------------------------------------------------------------------
Mon Oct 29 16:39:18 UTC 2018 - Dominique Leuenberger
@@ -89,7 +25,7 @@ Mon Oct 29 16:39:18 UTC 2018 - Dominique Leuenberger
-------------------------------------------------------------------
Mon Oct 8 08:33:08 UTC 2018 - ptrommler@icloud.com
-- update bindists to 8.4.3 for GHC 8.6.1 bootstrap
+- update bindists to 8.4.3 for GHC 8.6.1 bootstrap
-------------------------------------------------------------------
Wed Jul 18 14:26:16 UTC 2018 - psimons@suse.com
diff --git a/ghc-bootstrap.spec b/ghc-bootstrap.spec
index 142fd7c..eb30deb 100644
--- a/ghc-bootstrap.spec
+++ b/ghc-bootstrap.spec
@@ -1,7 +1,7 @@
#
# spec file for package ghc-bootstrap
#
-# 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
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -43,103 +43,92 @@
%ifarch x86_64
%define longarch x86_64
%endif
-%ifarch riscv64
-%define longarch riscv64
-%endif
%ifarch s390 s390x
%define sysname ibm
%endif
-%ifarch x86_64
-%define sysname unknown
-%endif
-%ifarch %{ix86}
-%define sysname unknown
-%endif
-%ifarch ppc64 ppc64le %{arm} aarch64 riscv64
+%ifarch x86_64 %{ix86}
+%define sysname deb8
+%endif
+%ifarch ppc64 ppc64le aarch64 %{arm}
%define sysname unknown
%endif
+
Name: ghc-bootstrap
+Version: 8.4.3
Release: 0
+Url: https://build.opensuse.org/package/view_file/devel:languages:haskell:bootstrap
Summary: Binary distributions of The Glorious Glasgow Haskell Compiler
License: BSD-3-Clause
Group: Development/Languages/Other
-URL: https://build.opensuse.org/package/view_file/devel:languages:haskell:bootstrap
Source1: README.openSUSE
Source2: LICENSE
-Source10: ghc-8.10.1-i386-unknown-linux.tar.xz
-Source12: ghc-8.10.1-powerpc64-unknown-linux.tar.xz
-Source13: ghc-8.10.1-powerpc64le-unknown-linux.tar.xz
-Source14: ghc-8.10.1-x86_64-unknown-linux.tar.xz
-Source16: ghc-8.6.5-s390x-ibm-linux.tar.xz
-Source17: ghc-8.10.1-aarch64-unknown-linux.tar.xz
-Source18: ghc-8.10.1-arm-unknown-linux.tar.xz
-Source19: ghc-8.10.1-riscv64-unknown-linux.tar.xz
+Source10: ghc-8.4.3-i386-deb8-linux.tar.xz
+Source12: ghc-8.4.3-powerpc64-unknown-linux.tar.xz
+Source13: ghc-8.4.3-powerpc64le-unknown-linux.tar.xz
+Source14: ghc-8.4.3-x86_64-deb8-linux.tar.xz
+Source16: ghc-8.4.3-s390x-ibm-linux.tar.xz
+Source17: ghc-8.4.3-aarch64-unknown-linux.tar.xz
+Source18: ghc-8.4.3-arm-unknown-linux.tar.xz
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: fdupes
BuildRequires: gmp-devel
BuildRequires: libncurses5
-BuildRequires: pkgconfig(libffi)
-Requires: gmp-devel
-Requires: libncurses5
-Requires: pkgconfig(libffi)
-# This package is not meant to be used outside OBS
-Requires: this-is-only-for-build-envs
-Provides: ghc-bootstrap-devel
-ExclusiveArch: %{ix86} ppc64 ppc64le x86_64 s390x aarch64 %{arm} riscv64
-AutoReq: off
-%ifnarch s390 s390x
-Version: 8.10.1
-%else
-Version: 8.6.5
-%endif
%ifnarch %{arm} s390x
BuildRequires: libnuma-devel
%endif
%ifarch aarch64 %{arm}
BuildRequires: binutils-gold
Requires: binutils-gold
-Requires: llvm9
%endif
-%ifnarch %{arm} s390x
-Requires: libnuma-devel
-Requires: libffi-devel
+%ifarch s390x
+BuildRequires: libffi-devel
%endif
+Requires: gmp-devel
+Requires: libncurses5
+# This package is not meant to be used outside OBS
+Requires: this-is-only-for-build-envs
+
+ExclusiveArch: %{ix86} ppc64 ppc64le x86_64 s390x aarch64 %{arm}
+Provides: ghc-bootstrap-devel
+
+AutoReq: off
%description
This package contains a binary distribution of "The Glorious Glasgow
Haskell Compilation System". See README.openSUSE on how the tarballs
were produced.
-Do not install this package! Install 'ghc' instead.
+Do not install this package! Install 'ghc' instead.
+
%prep
-cp %{SOURCE1} .
-cp %{SOURCE2} .
-cp %{SOURCE10} .
-cp %{SOURCE12} .
-cp %{SOURCE13} .
-cp %{SOURCE14} .
-cp %{SOURCE16} .
-cp %{SOURCE17} .
-cp %{SOURCE18} .
-cp %{SOURCE19} .
+cp %SOURCE1 .
+cp %SOURCE2 .
+cp %SOURCE10 .
+cp %SOURCE12 .
+cp %SOURCE13 .
+cp %SOURCE14 .
+cp %SOURCE16 .
+cp %SOURCE17 .
+cp %SOURCE18 .
%build
tar Jxf ghc-%{version}-%{longarch}-%{sysname}-linux.tar.xz
cd ghc-%{version}
-# FIXME: you should use the %%configure macro
./configure --prefix=/opt
%install
cd ghc-%{version}
-%make_install
+%makeinstall
%fdupes -s %{buildroot}
%post
/opt/bin/ghc-pkg recache
%files
+%defattr(-,root,root,-)
%doc README.openSUSE
-%license LICENSE
+%doc LICENSE
/opt
%changelog