ceph.spec.in: python-argparse only in Python 2.6

argparse is a widely-used Python module for parsing command-line arguments.
Ceph makes heavy use of Python scripts, both in the build environment and on
cluster nodes and clients.

Until Python 2.6, argparse was distributed separately from Python proper.
As of 2.7 it is part of the Python standard library.

Although the python package in a given distro may or may not Provide:
python-argparse, this cannot be relied upon.

Therefore, this commit puts appropriate conditionals around Requires:
python-argparse and BuildRequires: python-argparse. It does so for Red
Hat/CentOS and SUSE only, because the last Fedora version with Python 2.6
was Fedora 13, which is EOL.

argparse is required by both the ceph and ceph-common packages, but since ceph
requires ceph-common, the argparse Requires and BuildRequires need only appear
once, under ceph-common.

http://tracker.ceph.com/issues/12034 Fixes: #12034

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 23171c952997d104cfa6b5700ec0bb658a8e0915)

Conflicts:
	ceph.spec.in

diff --git a/ceph.spec.in b/ceph.spec.in
index b1372aa422a5cc3554d47f62bd2ac284d5489665..15392865453f4fa1a4990f507e6e20a65fa758ed 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -24,7 +24,6 @@ Requires:     librados2 = %{version}-%{release}
 Requires:      libcephfs1 = %{version}-%{release}
 Requires:      ceph-common = %{version}-%{release}
 Requires:      python
-Requires:      python-argparse
 Requires:      python-ceph
 Requires:      python-requests
 Requires:      python-flask
@@ -44,7 +43,6 @@ BuildRequires:        gdbm
 BuildRequires: pkgconfig
 BuildRequires: python
 BuildRequires: python-nose
-BuildRequires: python-argparse
 BuildRequires: libaio-devel
 BuildRequires: libcurl-devel
 BuildRequires: libxml2-devel
@@ -107,6 +105,11 @@ Requires:  librados2 = %{version}-%{release}
 Requires:      python-ceph = %{version}-%{release}
 Requires:      python-requests
 Requires:      redhat-lsb-core
+# python-argparse is only needed in distros with Python 2.6 or lower
+%if (0%{?rhel} && 0%{?rhel} <= 6) || (0%{?suse_version} && 0%{?suse_version} <= 1110)
+Requires:      python-argparse
+BuildRequires: python-argparse
+%endif
 %description -n ceph-common
 common utilities to mount and interact with a ceph storage cluster