From 8379edd97876a85fe1231b7cc8d4cc40f962c5cc Mon Sep 17 00:00:00 2001 From: Pavan Sondur Date: Mon, 7 Dec 2009 09:43:23 +0000 Subject: Disable fusermount by default in the rpm spec file and remove bdb references. Signed-off-by: Pavan Vilas Sondur Signed-off-by: Anand V. Avati BUG: 349 (FreeBSD compilation error (alloca.h).) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=349 --- glusterfs.spec.in | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 446018a69..6252a8fd2 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 BDB translator... -# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without bdb -%{?_without_bdb:%define _without_bdb --disable-bdb} - # if you wish to compile an rpm without libglusterfsclient... # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without libglfsclient %{?_without_libglfsclient:%define _without_libglfsclient --disable-libglusterclient} @@ -19,9 +15,9 @@ # 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} +# if you wish to compile an rpm with fusermount... +# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with fusermount +%{?_with_fusermount:%define _with_fusermount --enable-fusermount} Summary: Cluster File System Name: @PACKAGE_NAME@ @@ -39,7 +35,6 @@ Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service %{!?_without_ibverbs:BuildRequires: libibverbs-devel} -%{!?_without_bdb:BuildRequires: db4-devel} BuildRequires: bison flex BuildRequires: gcc make @@ -126,7 +121,7 @@ This package provides the development libraries. %build -%configure %{?_without_ibverbs} %{?_without_bdb} %{?_without_libglfsclient} %{?_without_client} %{?_without_epoll} +%configure %{?_without_ibverbs} %{?_without_libglfsclient} %{?_without_client} %{?_without_epoll} %{?_with_fusermount} # Remove rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -170,8 +165,8 @@ fi %if 0%{!?_without_client:1} %exclude %{_libdir}/glusterfs/%{version}/xlator/mount %endif -%if 0%{!?_without_fusermount:1} -%exclude %{_bindir}/fusermount-glusterfs +%if 0%{?_with_fusermount:1} +%{_bindir}/fusermount-glusterfs %endif %{_datadir}/glusterfs %{_bindir}/glusterfs-volgen -- cgit