Include .../site-packages/gluster/gfapi.py in glusterfs-api

The current plan is to wait with merging these changes to the other
branches. glusterfs-3.4.2 is expected to be released early next week, we
will need to provide new builds with that release anyway.
This commit is contained in:
Niels de Vos 2013-12-20 09:13:07 +01:00
parent a1e5e997b2
commit 9b53e576b1

View File

@ -50,7 +50,7 @@ Summary: Cluster File System
%if ( 0%{_for_fedora_koji_builds} ) %if ( 0%{_for_fedora_koji_builds} )
Name: glusterfs Name: glusterfs
Version: 3.4.2 Version: 3.4.2
Release: 0.1%{?prereltag:.%{prereltag}}.1%{?dist} Release: 0.1%{?prereltag:.%{prereltag}}%{?dist}
Vendor: Fedora Project Vendor: Fedora Project
%else %else
Name: @PACKAGE_NAME@ Name: @PACKAGE_NAME@
@ -388,6 +388,12 @@ This package provides the api include files.
%install %install
%{__rm} -rf %{buildroot} %{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot} %{__make} install DESTDIR=%{buildroot}
%if ! ( 0%{?rhel} && 0%{?rhel} <= 5 )
# install the gfapi Python library in /usr/lib/python*/site-packages
pushd api/examples
python setup.py install --skip-build --verbose --root %{buildroot}
popd
%endif
# Install include directory # Install include directory
%{__mkdir_p} %{buildroot}%{_includedir}/glusterfs %{__mkdir_p} %{buildroot}%{_includedir}/glusterfs
%{__install} -p -m 0644 libglusterfs/src/*.h \ %{__install} -p -m 0644 libglusterfs/src/*.h \
@ -412,10 +418,6 @@ This package provides the api include files.
%{__install} -D -p -m 0644 extras/glusterd-sysconfig \ %{__install} -D -p -m 0644 extras/glusterd-sysconfig \
%{buildroot}%{_sysconfdir}/sysconfig/glusterd %{buildroot}%{_sysconfdir}/sysconfig/glusterd
%endif %endif
%if ( 0%{?rhel} && 0%{?rhel} > 5 )
%{__mkdir_p} %{buildroot}%{python_sitelib}/gluster
touch %{buildroot}%{python_sitelib}/gluster/__init__.py
%endif
%if ( 0%{_for_fedora_koji_builds} ) %if ( 0%{_for_fedora_koji_builds} )
%if ( 0%{?rhel} && 0%{?rhel} <= 5 ) %if ( 0%{?rhel} && 0%{?rhel} <= 5 )
@ -762,7 +764,10 @@ if [ $1 -ge 1 ]; then
fi fi
%changelog %changelog
* Thu Dec 19 2013 Niels de Vos <ndevos@redhat.com> - 3.4.2-0.1qa4.1 * Fri Dec 20 2013 Niels de Vos <ndevos@redhat.com>
- Include .../site-packages/gluster/gfapi.py in glusterfs-api
* Thu Dec 19 2013 Niels de Vos <ndevos@redhat.com>
- Include the .../site-packages/gluster/__init__.py file by default, - Include the .../site-packages/gluster/__init__.py file by default,
skip EL-5 and earlier (#1045123) skip EL-5 and earlier (#1045123)