diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-03-24 20:44:07 +0000 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2014-03-24 20:44:07 +0000 |
| commit | efbb23837761bda6c526baca1b5ea72d227e2ae3 (patch) | |
| tree | 728199c73595103d7561dd9d441bdbe1845c6331 /glusterfs.spec.in | |
| parent | a58b023443b7a2ec089c45bf35bde2b0108aa19b (diff) | |
| parent | 17454dfea9f3c4d47fcf0b5370a6155f639c8aeb (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'glusterfs.spec.in')
| -rw-r--r-- | glusterfs.spec.in | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index c801198c3..66458934f 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 @@ -611,8 +616,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 |