diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2013-12-10 07:46:39 -0500 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2013-12-15 20:56:57 -0800 |
| commit | d0caeae1bf8bef6fec778825e7ea5d555ea9ae29 (patch) | |
| tree | 79d69dbaf5a5d1e9af886dc556d49d86f626b03b /extras | |
| parent | 620795f9db28186e648d089495a335f17f5679e8 (diff) | |
build: Merge glusterfs.spec changes from Fedora
sync with FedoraSCM glusterfs.spec
N.B. the %doc hack for clear_xattrs.sh doesn't work in the CentOS 5 mock
builds of the rpm.t regression test, thus I'm leaving that out for now
Change-Id: I3dce7ad2f850e7255b40b3fab0a2b0e44c724e83
BUG: 1039965
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/6474
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/LinuxRPM/Makefile.am | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/extras/LinuxRPM/Makefile.am b/extras/LinuxRPM/Makefile.am index 1dafa982bd6..593f850ac50 100644 --- a/extras/LinuxRPM/Makefile.am +++ b/extras/LinuxRPM/Makefile.am @@ -18,18 +18,8 @@ prep: -mkdir -p rpmbuild/SPECS -mkdir -p rpmbuild/RPMS -mkdir -p rpmbuild/SRPMS - -rm -rf rpmbuild/SOURCES - @if [ -d /d/cache/glusterfs -a -e /d/cache/glusterfs/sources ]; then \ - echo "copying glusterfs rpm files from local cache..." ; \ - mkdir -p ./rpmbuild/SOURCES; \ - cp /d/cache/glusterfs/* ./rpmbuild/SOURCES/ ; \ - elif [ -x /usr/bin/git ]; then \ - echo "fetching glusterfs rpm files from fedora git repo..."; \ - cd ./rpmbuild && git clone git://pkgs.fedoraproject.org/glusterfs.git > /dev/null && mv glusterfs SOURCES; \ - else \ - echo "glusterfs rpm files not fetched, you don't have git installed!" ; \ - exit 1 ; \ - fi + -mkdir -p rpmbuild/SOURCES + -rm -rf rpmbuild/SOURCES/* cp ../../*.tar.gz ./rpmbuild/SOURCES cp ../../glusterfs.spec ./rpmbuild/SPECS |