rpms/clamav/F-7 clamav.spec,1.62,1.63 sources,1.32,1.33

[Enrico Scholz (ensc)]

Author: ensc

Update of /cvs/extras/rpms/clamav/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17033/F-7

Modified Files:
	clamav.spec sources 
Log Message:
redisabled unrar stuff completely by using clean sources



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-7/clamav.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- clamav.spec	1 Jan 2008 14:59:33 -0000	1.62
+++ clamav.spec	1 Jan 2008 17:07:24 -0000	1.63
@@ -19,13 +19,20 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.92
-Release:	%release_func 5
+Release:	%release_func 6
 
 License:	%{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
 Group:		Applications/File
 URL:		http://www.clamav.net
+%if 0%{?with_unrar:1}
 Source0:	http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz
 Source999:	http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig
+%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
+%endif
 Source1:	clamd-wrapper
 Source2:	clamd.sysconfig
 Source3:	clamd.logrotate
@@ -229,6 +236,8 @@
 
 install -p -m0644 %SOURCE300 clamav-milter/
 
+mkdir -p libclamunrar{,_iface}
+%{!?with_unrar:> libclamunrar/Makefile.in; >libclamunrar_iface/Makefile.in; touch libclamunrar{,_iface}/{all,install}}
 
 perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g;
 	     s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g;
@@ -514,6 +523,9 @@
 
 
 %changelog
+* Tue Jan  1 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.92-6
+- redisabled unrar stuff completely by using clean sources
+
 * Tue Jan  1 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.92-5
 - use a better way to disable RPATH-generation (needed for '--with
   unrar' builds)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-7/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	1 Jan 2008 13:19:05 -0000	1.32
+++ sources	1 Jan 2008 17:07:24 -0000	1.33
@@ -1,2 +1 @@
-e500651858a9187a87025c8a5c23969c  clamav-0.92.tar.gz
-5ac3264d9b01b7dce93f646e247b2621  clamav-0.92.tar.gz.sig
+554d44a5b2265808750553d2e4d0d6fb  clamav-0.92.clean.tar.gz