]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec.in: python-argparse only in Python 2.6 5216/head
authorNathan Cutler <ncutler@suse.com>
Tue, 16 Jun 2015 16:27:20 +0000 (18:27 +0200)
committerNathan Cutler <ncutler@suse.com>
Thu, 16 Jul 2015 07:41:20 +0000 (09:41 +0200)
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)

ceph.spec.in

index f0c032c3bee1a5dfceec59f9efe81b93436ed89d..bf7cee67ba08f1971e7151e5da1a5c92bd857f7a 100644 (file)
@@ -28,7 +28,6 @@ Requires:     python-rados = %{epoch}:%{version}-%{release}
 Requires:      python-rbd = %{epoch}:%{version}-%{release}
 Requires:      python-cephfs = %{epoch}:%{version}-%{release}
 Requires:      python
-Requires:      python-argparse
 Requires:      python-requests
 Requires:      python-flask
 Requires:      xfsprogs
@@ -59,7 +58,6 @@ BuildRequires:        perl
 BuildRequires: parted
 BuildRequires: pkgconfig
 BuildRequires: python
-BuildRequires: python-argparse
 BuildRequires: python-nose
 BuildRequires: python-requests
 BuildRequires: python-virtualenv
@@ -126,12 +124,14 @@ Requires: python-rados = %{epoch}:%{version}-%{release}
 Requires:      python-rbd = %{epoch}:%{version}-%{release}
 Requires:      python-cephfs = %{epoch}:%{version}-%{release}
 Requires:      python-requests
-%if 0%{defined suse_version}
-Requires:  python-argparse
-%endif
 %if 0%{?rhel} || 0%{?fedora}
 Requires:  redhat-lsb-core
 %endif
+# 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.