From d5e872f115e5ab61d6dbcb2a830e9b9ea29bc0be Mon Sep 17 00:00:00 2001
From: ensc <ensc@fedoraproject.org>
Date: Thu, 11 Mar 2010 12:11:57 +0000
Subject: [PATCH] use $(CVS) instead of hardcoded cvs generate .xz instead of
 .bz2 tarballs

---
 Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 4a3ae71..39750ff 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,10 @@
 # Makefile for source rpm: clamav
 NAME := clamav
 SPECFILE = $(firstword $(wildcard *.spec))
+CVS ?= cvs
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; $(CVS) -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
@@ -11,7 +12,7 @@ MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
 ifeq ($(MAKEFILE_COMMON),)
 # attept a checkout
 define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+test -f CVS/Root && { $(CVS) -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
 endef
 
 MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
@@ -22,12 +23,12 @@ include $(MAKEFILE_COMMON)
 
 # can not use final tarball name here as it will conflict with rules
 # within Makefile.common
-TARBALL_CLEAN =	${NAME}-${VERSION}-norar.tar.bz2.tmp
+TARBALL_CLEAN =	${NAME}-${VERSION}-norar.tar.xz.tmp
 TARBALL =	${NAME}-${VERSION}.tar.gz
 
 clean-sources:	${TARBALL_CLEAN}
 
 ${TARBALL_CLEAN}:	${TARBALL}
 	rm -f $@.tmp
-	zcat $< | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > $@.tmp
+	zcat $< | tar --delete -f - '*/libclamunrar/*' | xz -c > $@.tmp
 	mv $@.tmp $@