From ef078a335980b5962239556e9b3a98f589662337 Mon Sep 17 00:00:00 2001 From: Pavan Sondur Date: Wed, 4 Nov 2009 01:23:18 +0000 Subject: Add glusterfs-volgen to master, change fusermount options and other changes to rpm spec file. The patch has the following changes: * Rename glusterfs-volgen.py and include it in the rpm spec file * Enable fusermount by default. Change fusermount configure option from disable to enable. * Remove BDB from configure.ac, essentially removing it from the normal build. * Remove all dependencies on fuse in the rpm spec file. Signed-off-by: Pavan Vilas Sondur Signed-off-by: Anand V. Avati BUG: 343 (Placeholder bug for adding volgen into rpm, bdb makefile changes, etc) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=343 --- glusterfs.spec.in | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'glusterfs.spec.in') diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 044496fcb91..7e5faa4a94a 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -7,10 +7,6 @@ # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without ibverbs %{?_without_ibverbs:%define _without_ibverbs --disable-ibverbs} -# if you wish to compile an rpm without building the client RPMs... -# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without client -%{?_without_client:%define _without_client --disable-fuse-client} - # if you wish to compile an rpm without BDB translator... # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without bdb %{?_without_bdb:%define _without_bdb --disable-bdb} @@ -23,6 +19,10 @@ # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without epoll %{?_without_epoll:%define _without_epoll --disable-epoll} +# if you wish to compile an rpm without fusermount... +# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without fusermount +%{?_without_fusermount:%define _without_fusermount --disable-fusermount} + Summary: Cluster File System Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -40,7 +40,6 @@ Requires(postun): /sbin/service %{!?_without_ibverbs:BuildRequires: libibverbs-devel} %{!?_without_bdb:BuildRequires: db4-devel} -%{!?_without_client:BuildRequires: fuse-devel} BuildRequires: bison flex BuildRequires: gcc make @@ -75,7 +74,6 @@ translator modules common to both GlusterFS server and client framework. %package client Summary: GlusterFS Client Group: Applications/File -Requires: fuse Requires: %{name}-common = %{version}-%{release} %description client @@ -171,10 +169,14 @@ fi %if 0%{!?_without_client:1} %exclude %{_libdir}/glusterfs/%{version}/xlator/mount %endif +%if 0%{!?_without_fusermount:1} +%exclude %{_bindir}/fusermount-glusterfs +%endif +%{_bindir}/glusterfs-volgen %{_libdir}/glusterfs %{_libdir}/*.so.* %{_sbindir}/glusterfs* -%{_mandir}/man8/glusterfs.8* +%{_mandir}/man8/*glusterfs.8* %dir /var/log/glusterfs %if 0%{!?_without_client:1} -- cgit