]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec.in: drop SUSE-specific %py_requires macro 5394/head
authorNathan Cutler <ncutler@suse.com>
Thu, 9 Jul 2015 09:51:13 +0000 (11:51 +0200)
committerNathan Cutler <ncutler@suse.com>
Wed, 29 Jul 2015 08:02:53 +0000 (10:02 +0200)
%py_requires expands to

BuildRequires: /usr/bin/python
PreReq: python = 2.7

The BuildRequires: is already provided, and the PreReq is wrong because
e.g. SLE11-SP3 (a platform we are trying to support) has Python 2.6.

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

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

Conflicts:
ceph.spec.in
            in master, the %py_requires is in the python-rados package,
            while in firefly it is in the python-ceph package

ceph.spec.in

index b1372aa422a5cc3554d47f62bd2ac284d5489665..9f601f0007ca7524d375259632757f2e782156bd 100644 (file)
@@ -219,9 +219,6 @@ Group:              System Environment/Libraries
 License:       LGPL-2.0
 Requires:      librados2 = %{version}-%{release}
 Requires:      librbd1 = %{version}-%{release}
-%if 0%{defined suse_version}
-%py_requires
-%endif
 %description -n python-ceph
 This package contains Python libraries for interacting with Cephs RADOS
 object storage.