From 115f6a679ba0117a5757fe69f8f326d633c38fbf Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Thu, 25 Jul 2013 20:10:55 -0700 Subject: build: Add '--without bd' to disable 'bd' xlator rpmbuild Change-Id: I9f1774788362d8250693002318b617cd16e1a668 BUG: 950083 Signed-off-by: Harshavardhana Reviewed-on: http://review.gluster.org/5397 Reviewed-by: Kaleb KEITHLEY Tested-by: Gluster Build System Reviewed-by: Bala FA Reviewed-by: Anand Avati --- glusterfs.spec.in | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 27fb51970..2e94c3315 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -35,6 +35,10 @@ # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@tar.gz --without syslog %{?_without_syslog:%global _without_syslog --disable-syslog} +# if you wish to compile an rpm without the BD map support... +# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without bd +%{?_without_bd:%global _without_bd --disable-bd-xlator} + %if ( 0%{?fedora} && 0%{?fedora} > 16 ) || ( 0%{?rhel} && 0%{?rhel} > 6 ) %global _with_systemd true %endif @@ -111,8 +115,10 @@ BuildRequires: systemtap-sdt-devel BuildRequires: python-devel BuildRequires: python-ctypes %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) +%if ( 0%{!?_without_bd:1} ) BuildRequires: lvm2-devel %endif +%endif Obsoletes: hekafs <= 0.7 Obsoletes: %{name}-libs <= 2.0.0 @@ -327,7 +333,7 @@ This package provides the api include files. %build ./autogen.sh -%configure %{?_without_rdma} %{?_without_epoll} %{?_without_fusermount} %{?_without_georeplication} %{?_without_ocf} %{?_without_syslog} +%configure %{?_without_rdma} %{?_without_epoll} %{?_without_fusermount} %{?_without_georeplication} %{?_without_ocf} %{?_without_syslog} %{?_without_bd} # fix hardening and remove rpath in shlibs %if ( 0%{?fedora} && 0%{?fedora} > 17 ) || ( 0%{?rhel} && 0%{?rhel} > 6 ) @@ -690,6 +696,9 @@ if [ $1 -ge 1 ]; then fi %changelog +* Thu Jul 25 2013 Harshavardhana +- Allow to build with '--without bd' to disable 'bd' xlator + * Thu Jun 27 2013 Kaleb S. KEITHLEY - fix the hardening fix for shlibs, use %{__sed} macro, shorter ChangeLog -- cgit