diff --git a/qemu.spec b/qemu.spec
index b9477ca..c9872bf 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -6,8 +6,6 @@
%global libfdt_version 1.6.0
%global libseccomp_version 2.4.0
%global libusbx_version 1.0.23
-# HS(submitted-upstream): bump required meson version
-# https://src.fedoraproject.org/rpms/qemu/pull-request/27
%global meson_version 0.59.3
%global usbredir_version 0.7.1
%global ipxe_version 20200823-5.git4bd064de
@@ -146,9 +144,6 @@
%define have_block_nfs 1
%endif
-# HS(needs-upstreaming): unconditionally use capstone-devel
-%define have_capstone_devel 1
-
%define have_librdma 1
%ifarch %{arm}
%define have_librdma 0
@@ -315,7 +310,7 @@ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release}
%endif
# To prevent rpmdev-bumpspec breakage
-%global baserelease 1
+%global baserelease 3
# Hyperscale release
%global hsrel .1
@@ -465,10 +460,8 @@ BuildRequires: libcacard-devel
# virgl 3d support
BuildRequires: virglrenderer-devel
%endif
-%if %{have_capstone_devel}
# preferred disassembler for TCG
BuildRequires: capstone-devel
-%endif
# qemu-ga
BuildRequires: libudev-devel
# qauth infrastructure
@@ -2751,12 +2744,16 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
%changelog
-* Thu Sep 08 2022 Davide Cavalca <dcavalca@centosproject.org> - 7.1.0-1.1
-- Bump required meson version
-- Unconditionally enable capstone-devel
+* Thu Sep 08 2022 Davide Cavalca <dcavalca@centosproject.org> - 7.1.0-3.1
- Enable some additional features for Hyperscale
- Number patches for compatibility with el8
+- Thu Sep 08 2022 Davide Cavalca <dcavalca@fedoraproject.org> - 7.1.0-3
+- Unconditionally enable capstone-devel
+
+- Thu Sep 08 2022 Davide Cavalca <dcavalca@fedoraproject.org> - 7.1.0-2
+- Bump required meson version
+
* Wed Aug 31 2022 Eduardo Lima (Etrunko) <etrunko@redhat.com> - 7.1.0-1
- Rebase to qemu 7.1.0