summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHumble Devassy Chirammal <hchiramm@redhat.com>2015-04-15 12:29:16 +0530
committerNiels de Vos <ndevos@redhat.com>2015-05-08 14:30:34 -0700
commit135e0fb4f312f59b36da8307b55c2a240d97ba05 (patch)
tree572b3d8aff01ee81c1c49d04021b14f16a27a17a
parent21c75d600be759003102983b48bb75f0f02e7ef6 (diff)
build: Introducing python-gluster package
Currently the gluster namespace/module is owned by glusterfs-api rpm. Because of this, other packages (extra-xlators or libgfapi-python) have to depend on glusterfs-api to get the gluster namespace. The gluster namespace should be owned by a core package.This patch introduce new package called python-gluster and moves the ownership of gluster module to python-gluster. Cherry picked from commit cf1c53343d4b6fe834833b76c50c61fd8a312de0: > Change-Id: Ib75ab922736f3bea6355da4d8dbec3a08b2844d5 > BUG: 1211848 > Signed-off-by: Humble Devassy Chirammal <hchiramm@redhat.com> > Reviewed-on: http://review.gluster.org/10244 > Tested-by: Gluster Build System <jenkins@build.gluster.com> > Reviewed-by: Niels de Vos <ndevos@redhat.com> > Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Change-Id: Ib75ab922736f3bea6355da4d8dbec3a08b2844d5 BUG: 1219787 Signed-off-by: Humble Devassy Chirammal <hchiramm@redhat.com> Reviewed-on: http://review.gluster.org/10672 Reviewed-by: Niels de Vos <ndevos@redhat.com> Tested-by: Niels de Vos <ndevos@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
-rw-r--r--glusterfs.spec.in36
1 files changed, 31 insertions, 5 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 01380f4014c..ffa11900f78 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -247,7 +247,7 @@ Summary: GlusterFS api library
Group: System Environment/Daemons
Requires: %{name} = %{version}-%{release}
# we provide the Python package/namespace 'gluster'
-Provides: python-gluster = %{version}-%{release}
+#Provides: python-gluster = %{version}-%{release}
%description api
GlusterFS is a distributed file-system capable of scaling to several
@@ -315,8 +315,8 @@ This package provides the development libraries and include files.
%package extra-xlators
Summary: Extra Gluster filesystem Translators
Group: Applications/File
-# We need -api rpm for its __init__.py in Python site-packages area
-Requires: %{name}-api = %{version}-%{release}
+# We need python-glusterfs rpm for gluster module's __init__.py in Python site-packages area
+Requires: python-%{name} = %{version}-%{release}
Requires: python python-ctypes
%description extra-xlators
@@ -416,6 +416,24 @@ is in user space and easily manageable.
This package provides the base GlusterFS libraries
+%package -n python-gluster
+Summary: GlusterFS python library
+Group: Development/Tools
+Requires: python
+
+%description -n python-gluster
+GlusterFS is a distributed file-system capable of scaling to several
+petabytes. It aggregates various storage bricks over Infiniband RDMA
+or TCP/IP interconnect into one large parallel network file
+system. GlusterFS is one of the most sophisticated file systems in
+terms of features and extensibility. It borrows a powerful concept
+called Translators from GNU Hurd kernel. Much of the code in GlusterFS
+is in user space and easily manageable.
+
+This package contains the python modules of GlusterFS and own gluster
+namespace.
+
+
%if ( 0%{!?_without_rdma:1} )
%package rdma
Summary: GlusterFS rdma support for ib-verbs
@@ -601,6 +619,8 @@ mkdir -p %{buildroot}%{_localstatedir}/log/glusterd
mkdir -p %{buildroot}%{_localstatedir}/log/glusterfs
mkdir -p %{buildroot}%{_localstatedir}/log/glusterfsd
mkdir -p %{buildroot}%{_localstatedir}/run/gluster
+touch %{buildroot}%{python_sitelib}/gluster/__init__.py
+
# Remove unwanted files from all the shared libraries
find %{buildroot}%{_libdir} -name '*.a' -delete
@@ -908,8 +928,6 @@ fi
%files api
%exclude %{_libdir}/*.so
-# Shared Python-GlusterFS files
-%{python_sitelib}/gluster/__init__.*
# libgfapi files
%{_libdir}/libgfapi.*
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/api*
@@ -998,6 +1016,11 @@ fi
# libgfdb is only needed server-side
%exclude %{_libdir}/libgfdb.*
+%files -n python-gluster
+# introducing glusterfs module in site packages.
+# so that all other gluster submodules can reside in the same namespace.
+%{python_sitelib}/gluster/__init__.*
+
%if ( 0%{!?_without_rdma:1} )
%files rdma
%{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/rdma*
@@ -1103,6 +1126,9 @@ fi
%changelog
+* Wed Apr 15 2015 Humble Chirammal <hchiramm@redhat.com>
+- Introducing python-gluster package to own gluster namespace in sitelib (#1211848)
+
* Sat Mar 28 2015 Mohammed Rafi KC <rkavunga@redhat.com>
- Add dependency for librdmacm version >= 1.0.15 (#1206744)