diff --git a/glusterfs.spec b/glusterfs.spec index 7235d38..f883714 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -1,12 +1,20 @@ -# Make it possible to disable the client by passing --without client +# Possible rpmbuild options +%{?_without_ibverbs:%define _without_ibverbs --disable-ibverbs} %{?_without_client:%define _without_client --disable-fuse-client} -# Default to disabling client on RHEL, but allow forcing --with client +%{?_without_python:%define _without_python --disable-python} + +# Default to disabling client on RHEL, but allow forcing --with client too %{?rhel:%{!?_with_client:%define _without_client --disable-fuse-client}} +# Disable the python bindings if we have < 2.4, since 2.4+ is required +%if "%(%{__python} -c "import sys ; print sys.version[:3]")" < "2.4" +%define _without_python --disable-python +%endif + Summary: Cluster File System Name: glusterfs Version: 1.3.8 -Release: 0.7%{?dist} +Release: 0.8%{?dist} License: GPLv3+ Group: System Environment/Base URL: http://www.gluster.org/docs/index.php/GlusterFS @@ -20,8 +28,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service -BuildRequires: python-devel %{!?_without_ibverbs:BuildRequires: libibverbs-devel} +%{!?_without_client:BuildRequires: fuse-devel} +%{!?_without_python:BuildRequires: python-devel} BuildRequires: flex, bison, byacc %description @@ -52,13 +61,11 @@ This package includes libglusterfs and glusterfs translator modules common to both GlusterFS server and client framework. -%if 0%{!?_without_client:1} %package client Summary: GlusterFS Client Group: Applications/File Requires: fuse Requires: %{name}-libs = %{version}-%{release} -BuildRequires: fuse-devel %description client GlusterFS is a clustered file-system capable of scaling to several @@ -70,7 +77,6 @@ called Translators from GNU Hurd kernel. Much of the code in GlusterFS is in userspace and easily manageable. This package provides the FUSE based GlusterFS client. -%endif %package server @@ -114,7 +120,7 @@ This package provides the development libraries. %build -%configure %{?_without_ibverbs:--disable-ibverbs} %{?_without_client} +%configure %{?_without_ibverbs} %{?_without_client} %{?_without_python} %{__make} %{?_smp_mflags} @@ -208,6 +214,9 @@ fi %changelog +* Sun Feb 3 2008 Matthias Saou 1.3.8-0.8 +- Add python version check and disable bindings for version < 2.4. + * Sun Feb 3 2008 Matthias Saou 1.3.8-0.7 - Add --without client rpmbuild option, make it the default for RHEL (no fuse). (I hope "rhel" is the proper default macro name, couldn't find it...)