rpms/glusterfs
6
0
Fork 0
Code Issues Pull Requests Releases Activity

GlusterFS 3.4.2 QA5, glusterfs-3.4.2-0.1qa5

Browse Source 
Moving the download location of the tarball from download.gluster,org to
bits.gluster.org. bits.gluster.org is still/currently used for automatic
releases triggered from Jenkins.

Also correcting some of the build issues that were caused by the
previous commit. The Python gfapi.py module was not included in previous
source tarballs and could not be tested.
This commit is contained in:
Niels de Vos 2013-12-25 15:15:17 +01:00
parent 9b53e576b1
commit 21f73d00a7
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
glusterfs.spec
View File

@ -4,7 +4,7 @@
%global _for_fedora_koji_builds 1
# uncomment and add '%' to use the prereltag for pre-releases
%global prereltag qa4
%global prereltag qa5
# if you wish to compile an rpm without rdma support, compile like this...
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma
@ -46,6 +46,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
@ -62,7 +68,7 @@ License: GPLv2 or LGPLv3+
Group: System Environment/Base
URL: http://www.gluster.org/docs/index.php/GlusterFS
%if ( 0%{_for_fedora_koji_builds} )
Source0: http://download.gluster.org/pub/gluster/glusterfs/qa-releases/%{version}%{prereltag}/glusterfs-%{version}%{?prereltag}.tar.gz
Source0: http://bits.gluster.org/pub/gluster/glusterfs/src/glusterfs-%{version}%{?prereltag}.tar.gz
Source1: glusterd.sysconfig
Source2: glusterfsd.sysconfig
Source3: glusterfs-fuse.logrotate
@ -284,6 +290,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
@ -385,15 +393,17 @@ This package provides the api include files.
%{__make} %{?_smp_mflags}
pushd api/examples
FLAGS="$RPM_OPT_FLAGS" python setup.py build
popd
%install
%{__rm} -rf %{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
%{__mkdir_p} %{buildroot}%{_includedir}/glusterfs
%{__install} -p -m 0644 libglusterfs/src/*.h \
@ -677,9 +687,7 @@ fi
%exclude %{_libdir}/*.so
%{_libdir}/libgfapi.*
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/api*
%if ! ( 0%{?rhel} && 0%{?rhel} <= 5 )
%{python_sitelib}/gluster/__init__.p*
%endif
%{python_sitelib}/*
%if ( 0%{!?_without_ocf:1} )
%files resource-agents
@ -764,6 +772,10 @@ if [ $1 -ge 1 ]; then
fi
%changelog
* Wed Dec 25 2013 Niels de Vos <ndevos@redhat.com> - 3.4.2-0.1qa5
- GlusterFS 3.4.2 QA5, glusterfs-3.4.2-0.1qa5
- Correct source URL to automatic release location
* Fri Dec 20 2013 Niels de Vos <ndevos@redhat.com>
- Include .../site-packages/gluster/gfapi.py in glusterfs-api