diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | glusterfs.spec.in | 18 |
2 files changed, 4 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index a6ad6b126fa..e50b46d05ef 100644 --- a/configure.ac +++ b/configure.ac @@ -1232,7 +1232,7 @@ case $host_os in esac if test "x$BUILD_GLUPY" = "xyes"; then - BUILD_PYTHON_SITE_PACKAGES=`$PYTHON -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())'` + BUILD_PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(prefix='$prefix'))"` BUILD_PYTHON_INC=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()"` BUILD_PYTHON_LIB=python$PYTHON_VERSION GLUPY_SUBDIR=glupy diff --git a/glusterfs.spec.in b/glusterfs.spec.in index cecc7e16b5a..20d72af72fa 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -616,21 +616,12 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|' libtool make %{?_smp_mflags} -# Build Glupy -pushd xlators/features/glupy/src -FLAGS="$RPM_OPT_FLAGS" python setup.py build -popd - %check make check %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} -# install the Glupy Python library in /usr/lib/python*/site-packages -pushd xlators/features/glupy/src -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 \ @@ -667,8 +658,6 @@ 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 @@ -1016,10 +1005,6 @@ exit 0 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/performance/symlink-cache.so # Glupy Python files %{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 -%endif %files fuse # glusterfs is a symlink to glusterfsd, -server depends on -fuse. @@ -1222,6 +1207,9 @@ exit 0 %changelog +* Sat May 14 2016 Niels de Vos <ndevos@redhat.com> +- build system got fixed so that special glupy build is not needed anymore + * Fri May 6 2016 Kaleb S. KEITHLEY <kkeithle@redhat.com> - additional dirs and files in /var/lib/glusterd/... (#1326413) |