diff --git a/_constraints b/_constraints
index 70acc38..4de687b 100644
--- a/_constraints
+++ b/_constraints
@@ -10,7 +10,7 @@
- 8
+ 16
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-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.10.2-s390x-ibm-linux.tar.xz b/ghc-8.10.2-s390x-ibm-linux.tar.xz
deleted file mode 100644
index 6eb59a8..0000000
--- a/ghc-8.10.2-s390x-ibm-linux.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3cd7aecc5a296045269f06ce49c858b0224fd3c7c5b862d6f3e74aad80d02e44
-size 132600848
diff --git a/ghc-8.10.4-riscv64-unknown-linux.tar.xz b/ghc-8.10.4-riscv64-unknown-linux.tar.xz
new file mode 100644
index 0000000..c9ae9ca
--- /dev/null
+++ b/ghc-8.10.4-riscv64-unknown-linux.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ee52d9b187409e440e274b6d9a3d75fa9d5b6d2f7558b130839b45d4521e95a6
+size 124917248
diff --git a/ghc-8.10.7-aarch64-unknown-linux.tar.xz b/ghc-8.10.7-aarch64-unknown-linux.tar.xz
new file mode 100644
index 0000000..4cd51f4
--- /dev/null
+++ b/ghc-8.10.7-aarch64-unknown-linux.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9e3815ac392c11722d8a64bf60e9796f708bee57309fea33f656cf160573cffc
+size 128429764
diff --git a/ghc-8.10.7-powerpc64-unknown-linux.tar.xz b/ghc-8.10.7-powerpc64-unknown-linux.tar.xz
new file mode 100644
index 0000000..e47049a
--- /dev/null
+++ b/ghc-8.10.7-powerpc64-unknown-linux.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:97f385c0ef142f353cac984ac3bfa8bdc4b52d3eb6a23ed3252b53acfd3eb82b
+size 117645740
diff --git a/ghc-8.10.7-powerpc64le-unknown-linux.tar.xz b/ghc-8.10.7-powerpc64le-unknown-linux.tar.xz
new file mode 100644
index 0000000..1d03193
--- /dev/null
+++ b/ghc-8.10.7-powerpc64le-unknown-linux.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5a7d9f9bd9a9475ee1e7ef3bf9a24a6f24abfe0a3576f2266df8f6d8dcc742c3
+size 119860212
diff --git a/ghc-8.10.7-s390x-ibm-linux.tar.xz b/ghc-8.10.7-s390x-ibm-linux.tar.xz
new file mode 100644
index 0000000..63c08a7
--- /dev/null
+++ b/ghc-8.10.7-s390x-ibm-linux.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5712245bcf9d9887e9d052f463a844e71cb44f5093cab62cb04c2cf47735d5bf
+size 136752520
diff --git a/ghc-8.10.7-x86_64-unknown-linux.tar.xz b/ghc-8.10.7-x86_64-unknown-linux.tar.xz
new file mode 100644
index 0000000..ec220f6
--- /dev/null
+++ b/ghc-8.10.7-x86_64-unknown-linux.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:14440f305e68dce895c8821f5086af2005e6f85e5bd69d7974f39bc7dc2101ca
+size 81963328
diff --git a/ghc-bootstrap.changes b/ghc-bootstrap.changes
index 7ca732a..51095a4 100644
--- a/ghc-bootstrap.changes
+++ b/ghc-bootstrap.changes
@@ -1,23 +1,3 @@
--------------------------------------------------------------------
-Thu Jan 19 12:39:27 UTC 2023 - Guillaume GARDET
-
-- Do not require unversionned llvm since ghc needs a specific
- llvm version. [boo#1207265]
-
--------------------------------------------------------------------
-Thu Dec 1 16:43:06 UTC 2022 - Peter Simons
-
-- Explictly depend on libffi8 to make sure we're getting the
- correct version of the libffi shared library. [jsc#PED-1151]
-
--------------------------------------------------------------------
-Fri Jun 24 07:13:19 UTC 2022 - Guillaume GARDET
-
-- Remove dependency on binutils-gold which have been removed from
- Factory
-- Allow a newer llvm to be used since llvm9 has been removed from
- Factory
-
-------------------------------------------------------------------
Fri Feb 11 08:40:15 UTC 2022 - Peter Simons
diff --git a/ghc-bootstrap.spec b/ghc-bootstrap.spec
index f51d6c5..a0f6161 100644
--- a/ghc-bootstrap.spec
+++ b/ghc-bootstrap.spec
@@ -1,7 +1,7 @@
#
# spec file for package ghc-bootstrap
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,12 +15,6 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-# Keep in sync with ghc.spec
-%if 0%{suse_version} > 1550
-%global llvm_major 12
-%else
-%global llvm_major 9
-%endif
%ifarch ppc
%define longarch powerpc
@@ -67,39 +61,36 @@ License: BSD-3-Clause
URL: https://build.opensuse.org/package/view_file/devel:languages:haskell:bootstrap
Source1: README.openSUSE
Source2: LICENSE
-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.10.2-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
+Source12: ghc-8.10.7-powerpc64-unknown-linux.tar.xz
+Source13: ghc-8.10.7-powerpc64le-unknown-linux.tar.xz
+Source14: ghc-8.10.7-x86_64-unknown-linux.tar.xz
+Source16: ghc-8.10.7-s390x-ibm-linux.tar.xz
+Source17: ghc-8.10.7-aarch64-unknown-linux.tar.xz
+Source19: ghc-8.10.4-riscv64-unknown-linux.tar.xz
BuildRequires: fdupes
BuildRequires: gmp-devel
BuildRequires: libncurses5
BuildRequires: pkgconfig(libffi)
-BuildRequires: libffi8 >= 3.4.4
Requires: gmp-devel
Requires: libncurses5
Requires: pkgconfig(libffi)
-Requires: libffi8 >= 3.4.4
# This package is not meant to be used outside OBS
Requires: this-is-only-for-build-envs
Provides: ghc-bootstrap-devel
-ExclusiveArch: ppc64 ppc64le x86_64 s390x aarch64 %{arm} riscv64
+ExclusiveArch: ppc64 ppc64le x86_64 s390x aarch64 riscv64
AutoReq: off
-%ifnarch s390 s390x
-Version: 8.10.1
+%ifarch riscv64
+Version: 8.10.4
Release: 0
%else
-Version: 8.10.2
+Version: 8.10.7
Release: 0
%endif
%ifnarch %{arm} s390x
BuildRequires: libnuma-devel
%endif
-%ifarch aarch64 %{arm}
-Requires: llvm%{llvm_major}
+%ifarch aarch64 riscv64
+Requires: llvm12
%endif
%ifnarch %{arm} s390x
Requires: libffi-devel
@@ -121,7 +112,6 @@ cp %{SOURCE13} .
cp %{SOURCE14} .
cp %{SOURCE16} .
cp %{SOURCE17} .
-cp %{SOURCE18} .
cp %{SOURCE19} .
%build