rpms/klamav/F-7 klamav-0.41.1-open-mode.patch, NONE, 1.1 klamav.spec, 1.3, 1.4 sources, 1.3, 1.4

[Andy Shevchenko (andriy)]

Author: andriy

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

Modified Files:
	klamav.spec sources 
Added Files:
	klamav-0.41.1-open-mode.patch 
Log Message:
Update to 0.41.1

klamav-0.41.1-open-mode.patch:

--- NEW FILE klamav-0.41.1-open-mode.patch ---
--- klamav-0.41.1/src/klamd/misc.c.open-mode	2007-07-24 22:51:54.000000000 +0300
+++ klamav-0.41.1/src/klamd/misc.c	2007-08-19 17:45:49.000000000 +0300
@@ -157,7 +157,7 @@ int filecopy(const char *src, const char
     if((s = open(src, O_RDONLY|O_BINARY)) == -1)
 	return -1;
 
-    if((d = open(dest, O_CREAT|O_WRONLY|O_TRUNC|O_BINARY)) == -1) {
+    if((d = open(dest, O_CREAT|O_WRONLY|O_TRUNC|O_BINARY, S_IRWXU)) == -1) {
 	close(s);
 	return -1;
     }


Index: klamav.spec
===================================================================
RCS file: /cvs/extras/rpms/klamav/F-7/klamav.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- klamav.spec	6 Mar 2007 09:59:14 -0000	1.3
+++ klamav.spec	5 Sep 2007 09:29:09 -0000	1.4
@@ -1,14 +1,13 @@
 Summary: Clam Anti-Virus on the KDE Desktop
 Name: klamav
-Version: 0.41
-Release: 2%{?dist}
-# Catch from http://ovh.dl.sourceforge.net/sourceforge/klamav/%{name}-%{version}-source.tar.gz
-Source0: %{name}-%{version}.tar.bz2
-#Source0: http://surfnet.dl.sourceforge.net/sourceforge/klamav/%{name}-%{version}.tar.bz2
+Version: 0.41.1
+Release: 5%{?dist}
+Source0: http://downloads.sourceforge.net/klamav/%{name}-%{version}.tar.bz2
 Patch0: klamav-suse-clamav-path.diff
+Patch1: klamav-0.41.1-open-mode.patch
 URL: http://klamav.sourceforge.net
 Group: Applications/System
-License: GPL
+License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: clamav >= 0.90
 Requires: clamav-update >= 0.90
@@ -17,6 +16,7 @@
 BuildRequires: curl-devel
 BuildRequires: gmp-devel
 BuildRequires: desktop-file-utils
+BuildRequires: sqlite-devel >= 3.0
 
 %description
 ClamAV Anti-Virus protection for the KDE desktop.
@@ -24,14 +24,15 @@
 %prep
 %setup -q
 %patch0 -p0 -b .suse-clamav-path
+%patch1 -p1 -b .open-mode
 
 %build
-%configure --disable-rpath
-%{__make} %{?_smp_mflags}
+%configure --disable-rpath --without-included-sqlite
+make %{?_smp_mflags}
 
 %install
 %{__rm} -rf "${RPM_BUILD_ROOT}"
-%{__make} DESTDIR="${RPM_BUILD_ROOT}" install
+make DESTDIR="${RPM_BUILD_ROOT}" install
 
 # Fix absolute link
 ln -sf ../common ${RPM_BUILD_ROOT}%{_datadir}/doc/HTML/en/klamav02/
@@ -42,8 +43,6 @@
 %{__rm} -f ${RPM_BUILD_ROOT}%{_datadir}/applnk/Utilities/%{name}.desktop.orig
 
 desktop-file-install --vendor fedora \
-    --add-category X-Fedora \
-    --add-category Utilities \
     --delete-original \
     --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/ \
     ${RPM_BUILD_ROOT}%{_datadir}/applnk/Utilities/%{name}.desktop
@@ -81,6 +80,16 @@
 %{_datadir}/icons/*/*x*/apps/klamav.png
 
 %changelog
+* Sun Aug 19 2007 Andy Shevchenko <andy at smile.org.ua> 0.41.1-5
+- fix desktop Categories
+- use system sqlite
+
+* Thu Aug 16 2007 Andy Shevchenko <andy at smile.org.ua> 0.41.1-3
+- update to 0.41.1
+- fix License tag according to new guidelines
+- do not use __make macro
+- fix __open_missing_mode error
+
 * Tue Mar 06 2007 Andy Shevchenko <andy at smile.org.ua> 0.41-2
 - rebuild against new clamav
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/klamav/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Feb 2007 12:30:41 -0000	1.3
+++ sources	5 Sep 2007 09:29:09 -0000	1.4
@@ -1 +1 @@
-275fe29fda8db6f83717761f42534392  klamav-0.41.tar.bz2
+066e4c7089f9ef42958583bd5438e9e2  klamav-0.41.1.tar.bz2