3.3.0-10, fix python dependencies, esp. on rhel
This commit is contained in:
parent
52a440ffb4
commit
68681524bd
@ -32,7 +32,7 @@
|
||||
Summary: Cluster File System
|
||||
Name: glusterfs
|
||||
Version: 3.3.0
|
||||
Release: 9%{?dist}
|
||||
Release: 10%{?dist}
|
||||
License: GPLv3+ and (GPLv2 or LGPLv3+)
|
||||
Group: System Environment/Base
|
||||
Vendor: Red Hat
|
||||
@ -228,19 +228,21 @@ Patch12: openstack-swift-nonet.patch
|
||||
Patch13: glusterfs-3.3.0.swift.patch
|
||||
#BuildRoot: %(mktemp -ud %{_tmppath}/swift-%{SWIFTVER}-%{release}-XXXXXX)
|
||||
|
||||
BuildRequires: dos2unix
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: python-setuptools
|
||||
BuildRequires: python-netifaces
|
||||
%if ( 0%{?rhel} && 0%{?rhel} < 7 )
|
||||
BuildRequires: python-webob1.0
|
||||
BuildRequires: python-paste-deploy1.5
|
||||
Requires: python-webob1.0
|
||||
Requires: python-paste-deploy1.5
|
||||
%else
|
||||
BuildRequires: python-webob
|
||||
BuildRequires: python-paste-deploy
|
||||
Requires: python-webob
|
||||
Requires: python-paste-deploy
|
||||
%endif
|
||||
BuildRequires: dos2unix
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: python-configobj
|
||||
Requires: python-eventlet >= 0.9.8
|
||||
@ -249,7 +251,6 @@ Requires: python-simplejson
|
||||
Requires: pyxattr
|
||||
Requires: python-setuptools
|
||||
Requires: python-netifaces
|
||||
Requires: python-netifaces
|
||||
|
||||
Conflicts: openstack-swift
|
||||
|
||||
@ -905,6 +906,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Sep 19 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.0-10
|
||||
- fix additional python dependencies, esp. for rhel
|
||||
|
||||
* Tue Sep 18 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.0-9
|
||||
- python-paste-deploy on RHEL 6, glusterfsd.init
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user