Cope with older versions of mock

package-rpm

@@ -53,8 +53,10 @@ mock() {
 		--define "releasetag ${RPMRELEASE:-1}" \
 		--define "srcname $DIST_DIR" \
 		--define "v_rc ${RELEASE}" \
+		--define "nocheck 1" \
 		"$@"
+	# XXX: no mechanism to make nocheck conditional
 }
 
 mock --buildsrpm --source . --spec "$DIST_DIR"/varnish.spec
-mock --rebuild "$RESULT_DIR"/varnish-*.src.rpm --nocheck
+mock --rebuild "$RESULT_DIR"/varnish-*.src.rpm

redhat/varnish.spec

@@ -84,7 +84,7 @@ export CFLAGS="$CFLAGS -O2 -g -Wp,-D_FORTIFY_SOURCE=0"
 
 %configure --localstatedir=/var/lib --without-rst2html
 
-make %{?_smp_mflags} V=1
+%make_build V=1
 
 # In 4.0 the built docs need to be copied to the current/4.1 location.
 test -d doc/html || cp -pr doc/sphinx/build/html doc/html
@@ -96,7 +96,9 @@ rm -rf doc/sphinx/build
 
 
 %check
-make check %{?_smp_mflags} LD_LIBRARY_PATH="../../lib/libvarnish/.libs:../../lib/libvarnishcompat/.libs:../../lib/libvarnishapi/.libs:../../lib/libvcc/.libs:../../lib/libvgz/.libs" VERBOSE=1
+%if 0%{?nocheck} == 0
+%make_build check VERBOSE=1
+%endif
 
 
 %install