summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Clift <justin@gluster.org>2014-03-07 18:01:05 +0000
committerAnand Avati <avati@redhat.com>2014-03-08 09:41:16 -0800
commite9ab4bc851490a8b494bf812acaac54a678c7bc2 (patch)
tree45a82f8afad3d715268e7ad04e14516e18a34872
parent82f20483f753f2da6c1449d739fafa506a424eda (diff)
build: Don't build geo-replication rpms when on EL5
Also fixes a typo bug where geo-replication isn't being disabled correctly BUG: 1074045 Change-Id: I28d42637bedcc28d65b6a34ab0183559202c4aed Signed-off-by: Justin Clift <justin@gluster.org> Reviewed-on: http://review.gluster.org/7210 Reviewed-by: Joe Julian <joe@julianfamily.org> Tested-by: Joe Julian <joe@julianfamily.org> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Niels de Vos <ndevos@redhat.com> Reviewed-by: Venky Shankar <vshankar@redhat.com>
-rw-r--r--glusterfs.spec.in9
1 files changed, 8 insertions, 1 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 5e66139..4ed1a75 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
@@ -615,8 +620,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