diff --git a/.cvsignore b/.cvsignore index f6ee3be..d34f911 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ clamav-*.tar.gz* +clamav-*.tar.bz2* clamav-*.*.rpm diff --git a/Makefile b/Makefile index 21be25f..2cc62a7 100644 --- a/Makefile +++ b/Makefile @@ -19,3 +19,16 @@ MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif 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 = ${NAME}-${VERSION}.tar.gz + +clean-sources: ${TARBALL_CLEAN} + +${TARBALL_CLEAN}: ${TARBALL} + rm -f $@.tmp + zcat $< | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > $@.tmp + mv $@.tmp $@ diff --git a/clamav.spec b/clamav.spec index 85b98e1..d03b5ec 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.65 2008/01/01 17:07:44 ensc Exp $ +## $Id: clamav.spec,v 1.66 2008/01/01 17:33:18 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,8 +18,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.92 -Release: %release_func 6 +Version: 0.92.1 +Release: %release_func 1 License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -30,8 +30,14 @@ Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar %else # Unfortunately, clamav includes support for RAR v3, derived from GPL # incompatible unrar from RARlabs. We have to pull this code out. -# All that is needed to make the clean tarball is: rm -rf libclamunrar* -Source0: %name-%version.clean.tar.gz +# tarball was created by +# +# zcat clamav-$V.tar.gz | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > clamav-$V-norar.tar.bz2 +# +# or +# +# make clean-sources [TARBALL=] +Source0: %name-%version-norar.tar.bz2 %endif Source1: clamd-wrapper Source2: clamd.sysconfig @@ -237,7 +243,7 @@ The SysV initscripts for clamav-milter. install -p -m0644 %SOURCE300 clamav-milter/ mkdir -p libclamunrar{,_iface} -%{!?with_unrar:touch libclamunrar{,_iface}/{Makefile.in,all,install}} +%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.!g; s!^#?(LocalSocket ).*!\1/var/run/clamd./clamd.sock!g; @@ -523,6 +529,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Feb 11 2008 Enrico Scholz - 0.92.1-1 +- updated to 0.92.1 + * Tue Jan 1 2008 Enrico Scholz - 0.92-6 - redisabled unrar stuff completely by using clean sources diff --git a/lastver b/lastver index ca6156a..da011ce 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.92 +0.92.1 diff --git a/sources b/sources index 10dd892..6e9b8a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -554d44a5b2265808750553d2e4d0d6fb clamav-0.92.clean.tar.gz +aecbcc39bf5b85e8967ddfa2bef4eb90 clamav-0.92.1-norar.tar.bz2