From 179411b98f42821f99ac7a1b620ad471bc1dcd97 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Oct 29 2007 14:25:28 +0000
Subject: Pull out rar code from clamav, resolve legal issue (334371).


---

diff --git a/.cvsignore b/.cvsignore
index f6ee3be..3fc2429 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-clamav-*.tar.gz*
-clamav-*.*.rpm
+clamav-0.91.2-clean.tar.bz2
diff --git a/clamav.spec b/clamav.spec
index a0b599e..6278230 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -1,4 +1,4 @@
-## $Id: clamav.spec,v 1.58 2007/08/25 10:40:56 ensc Exp $
+## $Id: clamav.spec,v 1.60 2007/10/29 10:22:00 spot Exp $
 
 ## Fedora Extras specific customization below...
 %bcond_without       fedora
@@ -18,13 +18,17 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.91.2
-Release:	%release_func 2
+Release:	%release_func 3
 
-License:	GPL
+License:	GPLv2
 Group:		Applications/File
 URL:		http://www.clamav.net
-Source0:	http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz
-Source999:	http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig
+# Unfortunately, clamav includes support for RAR v3, derived from GPL 
+# incompatible unrar from RARlabs. We have to pull this code out.
+Source0:	clamav-0.91.2-clean.tar.bz2
+# Source0:	http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz
+# No sense in using this file for the time being.
+# Source999:	http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig
 Source1:	clamd-wrapper
 Source2:	clamd.sysconfig
 Source3:	clamd.logrotate
@@ -507,6 +511,11 @@ test "$1"  = 0 || %_initrddir/clamav-milter condrestart >/dev/null || :
 
 
 %changelog
+* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa@redhat.com> - 0.91.2-3
+- remove RAR decompression code from source tarball because of 
+  legal problems (resolves 334371)
+- correct license tag
+
 * Mon Sep 24 2007 Jesse Keating <jkeating@redhat.com> - 0.91.2-2
 - Bump release for upgrade path.
 
diff --git a/sources b/sources
index 7a01a39..8a090b8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-2a7265d17cfa80c32858978f16a3f47b  clamav-0.91.2.tar.gz
-9e1b4659b506315dbc9f1c06dbe6273b  clamav-0.91.2.tar.gz.sig
+c072b629b19d97ebe246b87269bd2ac2  clamav-0.91.2-clean.tar.bz2