spec: remove _python_buildid in favor of python3_pkgversion macro

Signed-off-by: Alfredo Deza <adeza@redhat.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index e730800d5d16898462d989f52e44ca9d869d1dfe..7bfc48124a87791c3bbb20d3ec768b01c04b98cb 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -85,8 +85,6 @@
 %{!?python3_pkgversion: %global python3_pkgversion 3}
 %{!?python3_version_nodots: %global python3_version_nodots 3}
 %{!?python3_version: %global python3_version 3}
-# define _python_buildid macro
-%global _python_buildid %{python3_pkgversion}
 
 # unify libexec for all targets
 %global _libexecdir %{_exec_prefix}/lib
@@ -176,8 +174,8 @@ BuildRequires:      patch
 BuildRequires: perl
 BuildRequires: pkgconfig
 BuildRequires:  procps
-BuildRequires: python%{_python_buildid}
-BuildRequires: python%{_python_buildid}-devel
+BuildRequires: python%{python3_pkgversion}
+BuildRequires: python%{python3_pkgversion}-devel
 BuildRequires: snappy-devel
 BuildRequires: sudo
 BuildRequires: udev
@@ -197,11 +195,21 @@ BuildRequires:  librdkafka-devel
 %if 0%{with make_check}
 BuildRequires:  jq
 BuildRequires: libuuid-devel
-BuildRequires: python%{_python_buildid}-bcrypt
-BuildRequires: python%{_python_buildid}-nose
-BuildRequires: python%{_python_buildid}-requests
-BuildRequires: python%{_python_buildid}-six
-BuildRequires: python%{_python_buildid}-virtualenv
+BuildRequires: python%{python3_pkgversion}-bcrypt
+BuildRequires: python%{python3_pkgversion}-nose
+BuildRequires: python%{python3_pkgversion}-requests
+BuildRequires: python%{python3_pkgversion}-six
+BuildRequires: python%{python3_pkgversion}-virtualenv
+%if 0%{?rhel} < 8
+BuildRequires: python%{python3_pkgversion}-coverage
+BuildRequires: python%{python3_pkgversion}-pecan
+BuildRequires: python%{python3_pkgversion}-tox
+%endif
+%if 0%{?rhel} == 7
+BuildRequires:  pyOpenSSL%{python3_pkgversion}
+%else
+BuildRequires:  python%{python3_pkgversion}-pyOpenSSL
+%endif
 BuildRequires: socat
 %endif
 %if 0%{with seastar}
@@ -234,10 +242,10 @@ BuildRequires:  openldap2-devel
 #BuildRequires:  krb5
 #BuildRequires:  krb5-devel
 BuildRequires:  cunit-devel
-BuildRequires: python%{_python_buildid}-setuptools
-BuildRequires: python%{_python_buildid}-Cython
-BuildRequires: python%{_python_buildid}-PrettyTable
-BuildRequires: python%{_python_buildid}-Sphinx
+BuildRequires: python%{python3_pkgversion}-setuptools
+BuildRequires: python%{python3_pkgversion}-Cython
+BuildRequires: python%{python3_pkgversion}-PrettyTable
+BuildRequires: python%{python3_pkgversion}-Sphinx
 BuildRequires:  rdma-core-devel
 BuildRequires: liblz4-devel >= 1.7
 # for prometheus-alerts
@@ -262,8 +270,8 @@ BuildRequires:      python%{python3_version_nodots}-Cython
 %else
 BuildRequires: python%{python3_pkgversion}-Cython
 %endif
-BuildRequires: python%{_python_buildid}-prettytable
-BuildRequires: python%{_python_buildid}-sphinx
+BuildRequires: python%{python3_pkgversion}-prettytable
+BuildRequires: python%{python3_pkgversion}-sphinx
 BuildRequires: lz4-devel >= 1.7
 %endif
 # distro-conditional make check dependencies
@@ -271,13 +279,10 @@ BuildRequires:    lz4-devel >= 1.7
 %if 0%{?fedora} || 0%{?rhel}
 %if 0%{?fedora} || 0%{?rhel} == 7
 BuildRequires: libtool-ltdl-devel
-BuildRequires: python%{_python_buildid}-cherrypy
-BuildRequires: python%{_python_buildid}-coverage
-BuildRequires: python%{_python_buildid}-jwt
-BuildRequires: python%{_python_buildid}-routes
-BuildRequires: python%{_python_buildid}-pecan
-BuildRequires: python%{_python_buildid}-tox
-BuildRequires: python%{_python_buildid}-werkzeug
+BuildRequires: python%{python3_pkgversion}-cherrypy
+BuildRequires: python%{python3_pkgversion}-jwt
+BuildRequires: python%{python3_pkgversion}-routes
+BuildRequires: python%{python3_pkgversion}-werkzeug
 BuildRequires: xmlsec1
 BuildRequires: xmlsec1-devel
 BuildRequires: xmlsec1-nss
@@ -294,16 +299,11 @@ BuildRequires:  python%{_python_buildid}-pyOpenSSL
 BuildRequires: libxmlsec1-1
 BuildRequires: libxmlsec1-nss1
 BuildRequires: libxmlsec1-openssl1
-BuildRequires: python%{_python_buildid}-CherryPy
-BuildRequires: python%{_python_buildid}-PyJWT
-BuildRequires: python%{_python_buildid}-Routes
-BuildRequires: python%{_python_buildid}-Werkzeug
-BuildRequires: python%{_python_buildid}-coverage
-BuildRequires: python%{_python_buildid}-numpy-devel
-BuildRequires: python%{_python_buildid}-pecan
-BuildRequires: python%{_python_buildid}-pyOpenSSL
-BuildRequires: python%{_python_buildid}-tox
-BuildRequires: rpm-build
+BuildRequires: python%{python3_pkgversion}-CherryPy
+BuildRequires: python%{python3_pkgversion}-PyJWT
+BuildRequires: python%{python3_pkgversion}-Routes
+BuildRequires: python%{python3_pkgversion}-Werkzeug
+BuildRequires: python%{python3_pkgversion}-numpy-devel
 BuildRequires: xmlsec1-devel
 BuildRequires: xmlsec1-openssl-devel
 %endif
@@ -373,7 +373,7 @@ Requires:      grep
 Requires:      logrotate
 Requires:      parted
 Requires:      psmisc
-Requires:      python%{_python_buildid}-setuptools
+Requires:      python%{python3_pkgversion}-setuptools
 Requires:      util-linux
 Requires:      xfsprogs
 Requires:      which
@@ -405,17 +405,17 @@ Group:            System/Filesystems
 Requires:      librbd1 = %{_epoch_prefix}%{version}-%{release}
 Requires:      librados2 = %{_epoch_prefix}%{version}-%{release}
 Requires:      libcephfs2 = %{_epoch_prefix}%{version}-%{release}
-Requires:      python%{_python_buildid}-rados = %{_epoch_prefix}%{version}-%{release}
-Requires:      python%{_python_buildid}-rbd = %{_epoch_prefix}%{version}-%{release}
-Requires:      python%{_python_buildid}-cephfs = %{_epoch_prefix}%{version}-%{release}
-Requires:      python%{_python_buildid}-rgw = %{_epoch_prefix}%{version}-%{release}
-Requires:      python%{_python_buildid}-ceph-argparse = %{_epoch_prefix}%{version}-%{release}
-Requires:      python%{_python_buildid}-ceph-common = %{_epoch_prefix}%{version}-%{release}
+Requires:      python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release}
+Requires:      python%{python3_pkgversion}-rbd = %{_epoch_prefix}%{version}-%{release}
+Requires:      python%{python3_pkgversion}-cephfs = %{_epoch_prefix}%{version}-%{release}
+Requires:      python%{python3_pkgversion}-rgw = %{_epoch_prefix}%{version}-%{release}
+Requires:      python%{python3_pkgversion}-ceph-argparse = %{_epoch_prefix}%{version}-%{release}
+Requires:      python%{python3_pkgversion}-ceph-common = %{_epoch_prefix}%{version}-%{release}
 %if 0%{?fedora} || 0%{?rhel}
-Requires:      python%{_python_buildid}-prettytable
+Requires:      python%{python3_pkgversion}-prettytable
 %endif
 %if 0%{?suse_version}
-Requires:      python%{_python_buildid}-PrettyTable
+Requires:      python%{python3_pkgversion}-PrettyTable
 %endif
 %if 0%{with libradosstriper}
 Requires:      libradosstriper1 = %{_epoch_prefix}%{version}-%{release}
@@ -458,17 +458,17 @@ Summary:        Ceph Manager Daemon
 Group:          System/Filesystems
 %endif
 Requires:       ceph-base = %{_epoch_prefix}%{version}-%{release}
-Requires:       python%{_python_buildid}-bcrypt
-Requires:       python%{_python_buildid}-pecan
-Requires:       python%{_python_buildid}-requests
-Requires:       python%{_python_buildid}-six
+Requires:       python%{python3_pkgversion}-bcrypt
+Requires:       python%{python3_pkgversion}-pecan
+Requires:       python%{python3_pkgversion}-requests
+Requires:       python%{python3_pkgversion}-six
 %if 0%{?fedora} || 0%{?rhel}
-Requires:       python%{_python_buildid}-cherrypy
-Requires:       python%{_python_buildid}-werkzeug
+Requires:       python%{python3_pkgversion}-cherrypy
+Requires:       python%{python3_pkgversion}-werkzeug
 %endif
 %if 0%{?suse_version}
-Requires:       python%{_python_buildid}-CherryPy
-Requires:       python%{_python_buildid}-Werkzeug
+Requires:       python%{python3_pkgversion}-CherryPy
+Requires:       python%{python3_pkgversion}-Werkzeug
 %endif
 %if 0%{?weak_deps}
 Recommends:    ceph-mgr-dashboard = %{_epoch_prefix}%{version}-%{release}
@@ -477,12 +477,12 @@ Recommends:       ceph-mgr-diskprediction-cloud = %{_epoch_prefix}%{version}-%{release
 Recommends:    ceph-mgr-rook = %{_epoch_prefix}%{version}-%{release}
 Recommends:    ceph-mgr-k8sevents = %{_epoch_prefix}%{version}-%{release}
 Recommends:    ceph-mgr-cephadm = %{_epoch_prefix}%{version}-%{release}
-Recommends:    python%{_python_buildid}-influxdb
+Recommends:    python%{python3_pkgversion}-influxdb
 %endif
 %if 0%{?rhel} == 7
 Requires:       pyOpenSSL
 %else
-Requires:       python%{_python_buildid}-pyOpenSSL
+Requires:       python%{python3_pkgversion}-pyOpenSSL
 %endif
 %description mgr
 ceph-mgr enables python modules that provide services (such as the REST
@@ -499,22 +499,22 @@ Group:          System/Filesystems
 Requires:       ceph-mgr = %{_epoch_prefix}%{version}-%{release}
 Requires:       ceph-grafana-dashboards = %{_epoch_prefix}%{version}-%{release}
 %if 0%{?fedora} || 0%{?rhel}
-Requires:       python%{_python_buildid}-cherrypy
-Requires:       python%{_python_buildid}-ipaddress
-Requires:       python%{_python_buildid}-jwt
-Requires:       python%{_python_buildid}-routes
-Requires:       python%{_python_buildid}-werkzeug
+Requires:       python%{python3_pkgversion}-cherrypy
+Requires:       python%{python3_pkgversion}-ipaddress
+Requires:       python%{python3_pkgversion}-jwt
+Requires:       python%{python3_pkgversion}-routes
+Requires:       python%{python3_pkgversion}-werkzeug
 %endif
 %if 0%{?suse_version}
-Requires:       python%{_python_buildid}-CherryPy
-Requires:       python%{_python_buildid}-PyJWT
-Requires:       python%{_python_buildid}-Routes
-Requires:       python%{_python_buildid}-Werkzeug
+Requires:       python%{python3_pkgversion}-CherryPy
+Requires:       python%{python3_pkgversion}-PyJWT
+Requires:       python%{python3_pkgversion}-Routes
+Requires:       python%{python3_pkgversion}-Werkzeug
 %endif
 %if 0%{?rhel} == 7
 Requires:       pyOpenSSL
 %else
-Requires:       python%{_python_buildid}-pyOpenSSL
+Requires:       python%{python3_pkgversion}-pyOpenSSL
 %endif
 %description mgr-dashboard
 ceph-mgr-dashboard is a manager plugin, providing a web-based application
@@ -529,7 +529,7 @@ BuildArch:      noarch
 Group:          System/Filesystems
 %endif
 Requires:       ceph-mgr = %{_epoch_prefix}%{version}-%{release}
-Requires:       python%{_python_buildid}-numpy
+Requires:       python%{python3_pkgversion}-numpy
 Requires:       python3-scipy
 %if 0%{?rhel} == 7
 Requires:       numpy
@@ -557,7 +557,7 @@ Summary:        Ceph Manager plugin for Rook-based orchestration
 Group:          System/Filesystems
 %endif
 Requires:       ceph-mgr = %{_epoch_prefix}%{version}-%{release}
-Requires:       python%{_python_buildid}-kubernetes
+Requires:       python%{python3_pkgversion}-kubernetes
 %description mgr-rook
 ceph-mgr-rook is a ceph-mgr plugin for orchestration functions using
 a Rook backend.
@@ -569,12 +569,12 @@ Summary:        Ceph Manager plugin to orchestrate ceph-events to kubernetes' ev
 Group:          System/Filesystems
 %endif
 Requires:       ceph-mgr = %{_epoch_prefix}%{version}-%{release}
-Requires:       python%{_python_buildid}-kubernetes
+Requires:       python%{python3_pkgversion}-kubernetes
 %if 0%{?fedora} || 0%{?rhel}
-Requires:       python%{_python_buildid}-yaml
+Requires:       python%{python3_pkgversion}-yaml
 %endif
 %if 0%{?suse_version}
-Requires:       python%{_python_buildid}-PyYAML
+Requires:       python%{python3_pkgversion}-PyYAML
 %endif
 %description mgr-k8sevents
 ceph-mgr-k8sevents is a ceph-mgr plugin that sends every ceph-events
@@ -587,7 +587,7 @@ BuildArch:  noarch
 Group:          System/Filesystems
 %endif
 Requires:       ceph-mgr = %{_epoch_prefix}%{version}-%{release}
-Requires:       python%{_python_buildid}-remoto
+Requires:       python%{python3_pkgversion}-remoto
 Requires:       cephadm = %{_epoch_prefix}%{version}-%{release}
 %if 0%{?suse_version}
 Requires:       openssh
@@ -870,7 +870,7 @@ Group:              Development/Libraries/Python
 Requires:      librbd1 = %{_epoch_prefix}%{version}-%{release}
 Requires:      python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release}
 %{?python_provide:%python_provide python%{python3_pkgversion}-rbd}
-Provides:      python-rbd < %{_epoch_prefix}%{version}-%{release}
+Provides:      python-rbd = %{_epoch_prefix}%{version}-%{release}
 Obsoletes:     python-rbd < %{_epoch_prefix}%{version}-%{release}
 %description -n python%{python3_pkgversion}-rbd
 This package contains Python 3 libraries for interacting with Cephs RADOS