glusterfs.spec.in: resync with Fedora glusterfs.spec

Resync with Fedora's glusterfs.spec, being careful to preserve recent
additions to the glusterfs.spec.in such as the package-config for -devel
and the OCF sub-package

To build a set of RPMs:
 % ./autogen.sh
 % ./configure --enable-fusermount
 % make dist
 % cd extras/LinuxRPM && make glusterrpms

Updated rpm.t, hopefully build system has all the dependencies to build UFO

BUG: 819130
Change-Id: I1b1c161337ad780cf7d3ab401fa1b10648f38cbd
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/4454
Reviewed-by: Peter Portante <pportant@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>

1 files changed, 6 insertions, 7 deletions

diff --git a/tests/basic/rpm.t b/tests/basic/rpm.t
index f7854981087..9887a200e30 100755
--- a/tests/basic/rpm.t
+++ b/tests/basic/rpm.t
@@ -45,17 +45,16 @@ cd ${RESULT_DIR}/sources
 git clone -q -s file://${REPO} .
 git checkout -q -b rpm-test ${COMMIT}
 
-# build the .tar.gz
+# build the glusterfs-*.tar.gz and gluster-swift-ufo-*.tar.gz
 [ -e configure ] || ./autogen.sh 2>&1 > /dev/null
 TEST ./configure --enable-fusermount
+pwd
 TEST make dist
+ls *.tar.gz
 
-# need to use double quoting because the command is passed to TEST
-# EPEL-5 does not like new versions of rpmbuild and requires some _source_* defines
-TEST rpmbuild --define "'_srcrpmdir $PWD'" \
-	--define "'_source_payload w9.gzdio'" \
-	--define "'_source_filedigest_algorithm 1'" \
-	-ts *.tar.gz
+# build the glusterfs src.rpm
+ls extras
+TEST make -C extras/LinuxRPM testsrpm
 
 chmod g=rwx ${RESULT_DIR}
 chown :mock ${RESULT_DIR}