diff options
| -rw-r--r-- | glusterfs.spec.in | 4 | ||||
| -rw-r--r-- | xlators/features/glupy/src/Makefile.am | 2 | ||||
| -rw-r--r-- | xlators/features/glupy/src/__init__.py.in | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 8b77d656dae..cf40c7fc69c 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -914,6 +914,8 @@ fi %exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs* # Glupy files are in the -extra-xlators package %exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy* +%exclude /usr/lib/python2.7/site-packages/gluster/glupy.py* + # sample xlators not generally used or usable %exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption/rot-13* %exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/mac-compat* @@ -955,7 +957,7 @@ fi # Glupy C shared library %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy.so # Glupy Python files -%{python_sitelib}/gluster/glupy.* +%{python_sitelib}/gluster/glupy/* # Don't expect a .egg-info file on EL5 %if ( ! ( 0%{?rhel} && 0%{?rhel} < 6 ) ) %{python_sitelib}/glusterfs_glupy*.egg-info diff --git a/xlators/features/glupy/src/Makefile.am b/xlators/features/glupy/src/Makefile.am index 697f0c7e443..0354b1e9dba 100644 --- a/xlators/features/glupy/src/Makefile.am +++ b/xlators/features/glupy/src/Makefile.am @@ -15,7 +15,7 @@ glupy_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ noinst_HEADERS = glupy.h # Install glupy.py into the Python site-packages area -pyglupydir = @BUILD_PYTHON_SITE_PACKAGES@/gluster +pyglupydir = @BUILD_PYTHON_SITE_PACKAGES@/gluster/glupy pyglupy_PYTHON = glupy.py __init__.py CLEANFILES = diff --git a/xlators/features/glupy/src/__init__.py.in b/xlators/features/glupy/src/__init__.py.in index e69de29bb2d..3ad9513f40e 100644 --- a/xlators/features/glupy/src/__init__.py.in +++ b/xlators/features/glupy/src/__init__.py.in @@ -0,0 +1,2 @@ +from pkgutil import extend_path +__path__ = extend_path(__path__, __name__) |