Skip to content

Commit 3e98250

Browse files
committed
spec: CentOS 10 support + cleanup
- Support CentOS 10 - Drop if checks for el8 - Don't depend on Gluster since el10 Signed-off-by: Jean-Louis Dupond <jean-louis@dupond.be>
1 parent 2f87303 commit 3e98250

1 file changed

Lines changed: 17 additions & 33 deletions

File tree

ovirt-hosted-engine-setup.spec.in

Lines changed: 17 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
%global vdsmhooksdir %{_libexecdir}/vdsm/hooks
2424

2525
%global python_interpreter %{__python3}
26-
%global python38_target_version python38
2726
%global python_target_version python3
2827
%global python_sitelib %{python3_sitelib}
2928

@@ -41,28 +40,20 @@ BuildArch: noarch
4140

4241
# Python dependencies
4342

44-
Requires: %{python_target_version}
45-
%if 0%{?rhel} < 9
46-
# On RHEL 9 it uses Python 3.9 platform support.
47-
Requires: %{python38_target_version}
48-
%endif
49-
50-
Requires: %{python_target_version}-ethtool >= 0.6-3
51-
Requires: %{python_target_version}-ovirt-engine-sdk4 >= 4.3.1
52-
Requires: %{python_target_version}-sanlock
53-
Requires: %{python_target_version}-libselinux
43+
Requires: python3
44+
Requires: python3-ethtool >= 0.6-3
45+
Requires: python3-ovirt-engine-sdk4 >= 4.3.1
46+
Requires: python3-sanlock
47+
Requires: python3-libselinux
5448

55-
Requires: %{python_target_version}-distro
56-
%if 0%{?rhel} < 9
57-
# undeclared dependency of netaddr in python 3.6 only
58-
Requires: %{python_target_version}-importlib-resources
59-
%endif
60-
Requires: %{python_target_version}-netaddr
61-
Requires: %{python_target_version}-otopi >= 1.9.0
62-
Requires: %{python_target_version}-ovirt-setup-lib >= 1.3.3
49+
Requires: python3-distro
50+
Requires: python3-netaddr
51+
Requires: python3-otopi >= 1.9.0
52+
Requires: python3-ovirt-setup-lib >= 1.3.3
6353

64-
BuildRequires: %{python_target_version}-devel
65-
BuildRequires: %{python_target_version}-pytest
54+
BuildRequires: make
55+
BuildRequires: python3-devel
56+
BuildRequires: python3-pytest
6657
BuildRequires: gettext-devel
6758

6859
# Non Python dependencies
@@ -73,6 +64,7 @@ Requires: openssl
7364
Requires: sanlock >= 2.8
7465
Requires: sudo
7566
Requires: libvirt-client >= 6.6.0-9
67+
Requires: qemu-img
7668
Requires: virt-install
7769

7870
Requires: ansible-core >= 2.13
@@ -86,19 +78,11 @@ BuildRequires: gettext >= 0.18.2
8678
# TODO: figure out how to configure gettext to not require gcc.
8779
BuildRequires: gcc
8880

89-
%if 0%{?fedora}
90-
Requires: qemu-img
91-
%endif
92-
93-
%if 0%{?centos}
94-
Requires: qemu-img
95-
%else
96-
Requires: qemu-img >= 15:3.1.0-20.module+el8+2888+cdc893a8
97-
%endif
98-
99-
10081
Requires: ovirt-hosted-engine-ha >= 2.4
82+
# No GlusterFS in EL10+
83+
%if 0%{?rhel} < 10
10184
Requires: glusterfs-cli >= 5.6
85+
%endif
10286
Requires: vdsm-python >= 4.50
10387
Requires(post): vdsm-python >= 4.50
10488
Requires: ovirt-host >= 4.5.0
@@ -114,7 +98,7 @@ Hosted Engine setup tool for oVirt project.
11498
%setup -q -n %{name}-%{package_version}
11599

116100
%build
117-
%configure \
101+
%configure PYTHON="%{__python3}" \
118102
--docdir="%{_docdir}/%{name}-%{version}" \
119103
--disable-python-syntax-check \
120104
--disable-ansible-syntax-check \

0 commit comments

Comments
 (0)