rpms/klamav/devel klamav-0.46-suse-clamav-path.patch, NONE, 1.1 klamav.spec, 1.30, 1.31 klamav-suse-clamav-path.diff, 1.2, NONE

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/klamav/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15671/devel

Modified Files:
	klamav.spec 
Added Files:
	klamav-0.46-suse-clamav-path.patch 
Removed Files:
	klamav-suse-clamav-path.diff 
Log Message:
- rediff suse-clamav-path patch

klamav-0.46-suse-clamav-path.patch:

--- NEW FILE klamav-0.46-suse-clamav-path.patch ---
diff -ur klamav-0.46/src/klammail/clamdmail.c klamav-0.46-suse-clamav-path/src/klammail/clamdmail.c
--- klamav-0.46/src/klammail/clamdmail.c	2009-02-28 11:27:28.000000000 +0100
+++ klamav-0.46-suse-clamav-path/src/klammail/clamdmail.c	2009-03-10 01:39:09.000000000 +0100
@@ -576,7 +576,7 @@
                     break;
                     }
     }else{
-            fprintf(tmp,"DatabaseDirectory /usr/local/share/clamav\n");
+            fprintf(tmp,"DatabaseDirectory /var/lib/clamav\n");
     }
     //fprintf(tmp,"ScanMail\n");
     if ((strstr(cl_retver(), "0.8")) || (strstr(cl_retver(), "0.7")))


Index: klamav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/klamav/devel/klamav.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- klamav.spec	10 Mar 2009 00:30:58 -0000	1.30
+++ klamav.spec	10 Mar 2009 00:41:39 -0000	1.31
@@ -3,7 +3,7 @@
 Version: 0.46
 Release: 1%{?dist}
 Source0: http://downloads.sourceforge.net/klamav/%{name}-%{version}.tar.bz2
-Patch0: klamav-suse-clamav-path.diff
+Patch0: klamav-0.46-suse-clamav-path.diff
 # Upstream notified via mailing list:
 # http://sourceforge.net/mailarchive/message.php?msg_name=20080123100636.GC1177%40serv.smile.org.ua
 Patch1: klamav-0.41.1-pwd-echo.patch
@@ -31,7 +31,7 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .suse-clamav-path
+%patch0 -p1 -b .suse-clamav-path
 %patch1 -p1 -b .pwd-echo
 %patch2 -p1 -b .no-kde3-mediamanager
 
@@ -92,6 +92,7 @@
 - upgrade to 0.46 (compatible with clamav 0.95rc1)
 - drop klamav-clamav094.patch (fixed upstream)
 - disable device mounting which requires KDE 3 (#483518)
+- rediff suse-clamav-path patch
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.44-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild


--- klamav-suse-clamav-path.diff DELETED ---