rpms/klamav/F-10 klamav-0.44-no-kde3-mediamanager.patch, NONE, 1.1 klamav-0.46-suse-clamav-path.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 klamav.spec, 1.26, 1.27 sources, 1.6, 1.7

[Andy Shevchenko]

Author: andriy

Update of /cvs/extras/rpms/klamav/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30344

Modified Files:
	.cvsignore klamav.spec sources 
Added Files:
	klamav-0.44-no-kde3-mediamanager.patch 
	klamav-0.46-suse-clamav-path.patch 
Log Message:
Update to 0.46. Fix #483518

klamav-0.44-no-kde3-mediamanager.patch:

--- NEW FILE klamav-0.44-no-kde3-mediamanager.patch ---
diff -ur klamav-0.44/src/directorylist.cpp klamav-0.44-no-kde3-mediamanager/src/directorylist.cpp
--- klamav-0.44/src/directorylist.cpp	2008-07-06 14:05:42.000000000 +0200
+++ klamav-0.44-no-kde3-mediamanager/src/directorylist.cpp	2009-03-08 09:43:59.000000000 +0100
@@ -68,7 +68,7 @@
     reinterpret_cast<QWidget*>(m_view->header())->hide();
     new Item(  m_view, i18n( "System Folder" ), "/", "folder_red" );
     new Item(  m_view, i18n( "Home Folder" ), QDir::homeDirPath(), "folder_home" );
-    new DeviceItem(  m_view );
+    // new DeviceItem(  m_view );
     
     setSpacing( 6 );
 }

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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/klamav/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Jul 2008 15:55:32 -0000	1.6
+++ .cvsignore	19 Mar 2009 09:19:27 -0000	1.7
@@ -1 +1 @@
-klamav-0.44.tar.bz2
+klamav-0.46.tar.bz2


Index: klamav.spec
===================================================================
RCS file: /cvs/extras/rpms/klamav/F-10/klamav.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- klamav.spec	28 Oct 2008 04:39:40 -0000	1.26
+++ klamav.spec	19 Mar 2009 09:19:28 -0000	1.27
@@ -1,11 +1,14 @@
 Summary: Clam Anti-Virus on the KDE Desktop
 Name: klamav
-Version: 0.44
-Release: 3%{?dist}
+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.patch
+# 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
-Patch2: klamav-clamav094.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=483518
+Patch2: klamav-0.44-no-kde3-mediamanager.patch
 URL: http://klamav.sourceforge.net
 Group: Applications/System
 License: GPLv2+
@@ -28,9 +31,9 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .suse-clamav-path
+%patch0 -p1 -b .suse-clamav-path
 %patch1 -p1 -b .pwd-echo
-%patch2 -p1 -b .clamav094
+%patch2 -p1 -b .no-kde3-mediamanager
 
 %build
 %configure --disable-rpath --without-included-sqlite
@@ -64,7 +67,7 @@
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-   
+
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -81,10 +84,18 @@
 %{_datadir}/apps/klamav
 %{_datadir}/apps/konqueror/servicemenus/klamav-dropdown.desktop
 %{_datadir}/config.kcfg/klamavconfig.kcfg
-%{_datadir}/icons/*/*x*/actions/klamav.png
 %{_datadir}/icons/*/*x*/apps/klamav.png
 
 %changelog
+* Tue Mar 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.46-1
+- 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
+
 * Tue Oct 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.44-3
 - rebuild for clamav 0.94
 - add klamav-clamav094.patch from Gentoo


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/klamav/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Jul 2008 15:55:32 -0000	1.6
+++ sources	19 Mar 2009 09:19:28 -0000	1.7
@@ -1 +1 @@
-0f5b89db6a8e5d4151a967e4983b4c10  klamav-0.44.tar.bz2
+0c189ccc63434fe29b8eba166950551f  klamav-0.46.tar.bz2