build: FedoraSCM sources are not longer needed to build RPMs

Also some updates to .gitignore

Change-Id: I576af453ca7d1ec1f3db21ee4d8386927988e7db
BUG: 950083
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/6458
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
This commit is contained in:
Kaleb S. KEITHLEY 2013-12-06 14:33:51 -05:00 committed by Anand Avati
parent 39dd3b21c5
commit f4488e3455
2 changed files with 6 additions and 14 deletions

6
.gitignore vendored
View File

@ -30,6 +30,7 @@ extras/init.d/glusterd-Debian
extras/init.d/glusterd-Redhat
extras/init.d/glusterd-SuSE
extras/init.d/glusterd.plist
extras/systemd/glusterd.service
extras/ocf/glusterd
extras/ocf/volume
extras/who-wrote-glusterfs/gitdm
@ -40,9 +41,10 @@ libgfchangelog.pc
libglusterfs/src/spec.lex.c
libglusterfs/src/y.tab.c
libglusterfs/src/y.tab.h
libglusterfs/src/gf-error-codes.h
libtool
run-tests.sh
ufo/.tox
ufo/test/unit/.coverage
xlators/mount/fuse/utils/mount.glusterfs
xlators/mount/fuse/utils/mount_glusterfs
geo-replication/src/peer_add_secret_pub
geo-replication/src/peer_gsec_create

View File

@ -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