From 48d9d9a5dd7a8615429996025d6bdd093da5c3b2 Mon Sep 17 00:00:00 2001 From: Lalatendu Mohanty Date: Sat, 29 Nov 2014 01:33:00 +0530 Subject: [PATCH] Fix build on el5 (upstream bug 1169004) --- glusterfs.spec | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index 1d7edee..f15c137 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -146,7 +146,7 @@ Summary: Cluster File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 3.6.1 -Release: 3%{?prereltag:.%{prereltag}}%{?dist} +Release: 4%{?prereltag:.%{prereltag}}%{?dist} Vendor: Fedora Project %else Name: @PACKAGE_NAME@ @@ -720,6 +720,14 @@ find ./tests ./run-tests.sh -type f | cpio -pd %{buildroot}%{_prefix}/share/glus install -p -m 0744 -D extras/command-completion/gluster.bash \ %{buildroot}%{_sysconfdir}/bash_completion.d/gluster +%if ( 0%{?_without_georeplication:1} ) +rm -rf %{buildroot}%{_datadir}/glusterfs/scripts/get-gfid.sh +rm -rf %{buildroot}%{_datadir}/glusterfs/scripts/slave-upgrade.sh +rm -rf %{buildroot}%{_datadir}/glusterfs/scripts/gsync-upgrade.sh +rm -rf %{buildroot}%{_datadir}/glusterfs/scripts/generate-gfid-file.sh +rm -rf %{buildroot}%{_datadir}/glusterfs/scripts/gsync-sync-gfid +%endif + ## While introducing symbol versioning in libgfapi.so, the pkg-config version ## for gluster-api got reset to 0. This is causing users of pkg-config to be ## confused, they can not reliably check the version anymore. In upstream @@ -975,7 +983,12 @@ fi %if ( ! 0%{_for_fedora_koji_builds} ) %files regression-tests %{_prefix}/share/glusterfs/* -%exclude %{_prefix}/share/glusterfs/tests/basic/rpm.t +%exclude %{_datadir}/glusterfs/tests/basic/rpm.t +%exclude %{_datadir}/glusterfs/scripts/generate-gfid-file.sh +%exclude %{_datadir}/glusterfs/scripts/get-gfid.sh +%exclude %{_datadir}/glusterfs/scripts/gsync-sync-gfid +%exclude %{_datadir}/glusterfs/scripts/gsync-upgrade.sh +%exclude %{_datadir}/glusterfs/scripts/slave-upgrade.sh %endif %if ( 0%{!?_without_ocf:1} ) @@ -1059,6 +1072,9 @@ fi %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid %changelog +* Sat Nov 29 2014 Lalatendu Mohanty 3.6.1-4 +- Fix build on el5 (upstream bug 1169004) + * Thu Nov 20 2014 Niels de Vos 3.6.1-3 - Fix version in gluster-api.pc (upstream bug 1166232)