diff options
| author | Niels de Vos <ndevos@redhat.com> | 2013-09-30 09:05:14 +0200 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-10-02 13:04:03 -0700 |
| commit | c499ef86a2dfd4e7727ce876b6cf18ba79c94fe5 (patch) | |
| tree | cfe2a3ec9a71a8901f5e482a179caec56020a056 /glusterfs.spec.in | |
| parent | a66bf67965dddd9decd9210c3a530fdc85b6430c (diff) | |
| download | glusterfs-c499ef86a2dfd4e7727ce876b6cf18ba79c94fe5.tar.gz glusterfs-c499ef86a2dfd4e7727ce876b6cf18ba79c94fe5.tar.xz glusterfs-c499ef86a2dfd4e7727ce876b6cf18ba79c94fe5.zip | |
gfapi.py: support dynamic loading of versioned libraries
Currently gfapi.py only loads libraries by filename ending in ".so". On
an installed system without development packages, the <lib>.so filenames
are not available. ctypes.util.find_library() can be used to detect the
files dynamically.
In addition to this, also fixing some minor indention errors and package
the library into the Python site-packages path. Python applications and
libraries can now access libgfapi through 'from glusterfs import gfapi'.
Change-Id: I71e38dabd3ade5dcf24813bf2fc25cda91b571c6
BUG: 1005146
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/5835
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'glusterfs.spec.in')
| -rw-r--r-- | glusterfs.spec.in | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 96341adf9e..8940fdc0fe 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -63,6 +63,12 @@ %global _with_systemd true %endif +# From https://fedoraproject.org/wiki/Packaging:Python#Macros +%if ( 0%{?rhel} && 0%{?rhel} <= 5 ) +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%endif + Summary: Cluster File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs @@ -315,6 +321,8 @@ This package provides the glusterfs server daemon. Summary: Clustered file-system api library Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} +# we provide the Python package/namespace 'gluster' +Provides: python-gluster = %{version}-%{release} %description api GlusterFS is a clustered file-system capable of scaling to several @@ -325,7 +333,7 @@ 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 provides the glusterfs libgfapi library +This package provides the glusterfs libgfapi library. %if ( 0%{!?_without_ocf:1} ) %package resource-agents @@ -437,9 +445,17 @@ regression testing of Gluster. %{__make} %{?_smp_mflags} +pushd api/examples +FLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build +popd + %install %{__rm} -rf %{buildroot} %{__make} install DESTDIR=%{buildroot} +# install the gfapi Python library in /usr/lib/python*/site-packages +pushd api/examples +%{__python} setup.py install --skip-build --verbose --root %{buildroot} +popd # Install include directory %{__mkdir_p} %{buildroot}%{_includedir}/glusterfs %{__install} -p -m 0644 libglusterfs/src/*.h \ @@ -768,6 +784,7 @@ fi %exclude %{_libdir}/*.so %{_libdir}/libgfapi.* %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/api* +%{python_sitelib}/* %if ( 0%{!?_without_ocf:1} ) %files resource-agents @@ -858,6 +875,9 @@ if [ $1 -ge 1 ]; then fi %changelog +* Thu Sep 30 2013 Niels de Vos <ndevos@redhat.com> +- Package gfapi.py into the Python site-packages path (#1005146) + * Tue Sep 17 2013 Harshavardhana <fharshav@redhat.com> - Provide a new package called "glusterfs-regression-tests" for standalone regression testing. |