From 29cbd30acd5d7a66451df09c7b94ff4bbe8b0e18 Mon Sep 17 00:00:00 2001 From: Justin Clift Date: Fri, 7 Mar 2014 18:01:05 +0000 Subject: build: Don't build geo-replication rpms when on EL5 Also fixes a typo bug where geo-replication isn't being disabled correctly Backport of http://review.gluster.org/#/c/7210/ BUG: 1074045 Change-Id: I0f8f632c4ed1bdde179d6d7278e10e196549ca38 Signed-off-by: Justin Clift Reviewed-on: http://review.gluster.org/7297 Tested-by: Gluster Build System Reviewed-by: Kaleb KEITHLEY Reviewed-by: Vijay Bellur --- glusterfs.spec.in | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/glusterfs.spec.in b/glusterfs.spec.in index d7bc64809..4beb21004 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -24,7 +24,12 @@ # if you wish to compile an rpm without geo-replication support, compile like this... # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without georeplication -%{?_without_georeplication:%global _without_georeplication --disable-geo-replication} +%{?_without_georeplication:%global _without_georeplication --disable-georeplication} + +# Disable geo-replication on EL5, as its default Python is too old +%if ( 0%{?rhel} && 0%{?rhel} < 6 ) +%global _without_georeplication --disable-georeplication +%endif # if you wish to compile an rpm without the OCF resource agents... # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without ocf @@ -612,8 +617,10 @@ mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/nfs/run touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/nfs-server.vol touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/run/nfs.pid +%if ( 0%{!?_without_georeplication:1} ) install -p -m 0744 extras/hook-scripts/S56glusterd-geo-rep-create-post.sh \ %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/gsync-create/post +%endif find ./tests ./run-tests.sh -type f | cpio -pd %{buildroot}%{_prefix}/share/glusterfs -- cgit