rpms/klamav/devel .cvsignore, 1.4, 1.5 klamav.spec, 1.17, 1.18 sources, 1.4, 1.5

[Andy Shevchenko (andriy)]

Author: andriy

Update of /cvs/extras/rpms/klamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4522

Modified Files:
	.cvsignore klamav.spec sources 
Log Message:
Update to 0.42


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/klamav/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Aug 2007 14:09:24 -0000	1.4
+++ .cvsignore	13 Feb 2008 16:43:27 -0000	1.5
@@ -1 +1 @@
-klamav-0.41.1.tar.bz2
+klamav-0.42.tar.bz2


Index: klamav.spec
===================================================================
RCS file: /cvs/extras/rpms/klamav/devel/klamav.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- klamav.spec	10 Jan 2008 15:00:37 -0000	1.17
+++ klamav.spec	13 Feb 2008 16:43:27 -0000	1.18
@@ -1,15 +1,11 @@
 Summary: Clam Anti-Virus on the KDE Desktop
 Name: klamav
-Version: 0.41.1
-Release: 14%{?dist}
+Version: 0.42
+Release: 1%{?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
-Patch2: klamav-0.41.1-no-sqlite.patch
-Patch3: klamav-0.41.1-pwd-echo.patch
-Patch4: klamav-0.41.1-clam0.92.patch
-Patch5: klamav-0.41.1-gcc43.patch
-Patch6: klamav-0.41.1-maximum.patch
+Patch1: klamav-0.41.1-pwd-echo.patch
+Patch2: klamav-0.41.1-gcc43.patch
 URL: http://klamav.sourceforge.net
 Group: Applications/System
 License: GPLv2+
@@ -33,20 +29,11 @@
 %prep
 %setup -q
 %patch0 -p0 -b .suse-clamav-path
-%patch1 -p1 -b .open-mode
-%patch2 -p1 -b .no-sqlite
-%patch3 -p1 -b .pwd-echo
-%patch4 -p1 -b .clam0.92
-%patch5 -p1 -b .gcc43
+%patch1 -p1 -b .pwd-echo
+%patch2 -p1 -b .gcc43
 
 %build
 %configure --disable-rpath --without-included-sqlite
-
-# Use this trick to patch generated files
-make -C src klamavconfig.cpp
-# Don't use patch macro here
-patch -p1 -b --suffix=.maximum < %{PATCH6}
-
 make %{?_smp_mflags}
 
 %install
@@ -89,7 +76,6 @@
 %{_bindir}/klamav
 %{_bindir}/klammail
 %{_bindir}/klamarkollon
-%{_bindir}/klamd
 %attr(755,root,root) %{_bindir}/ScanWithKlamAV
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/apps/klamav
@@ -99,6 +85,10 @@
 %{_datadir}/icons/*/*x*/apps/klamav.png
 
 %changelog
+* Wed Feb 13 2008 Andy Shevchenko <andy at smile.org.ua> 0.42-1
+- update to 0.42
+- remove upstreamed and useless patches
+
 * Thu Jan 10 2008 Andy Shevchenko <andy at smile.org.ua> 0.41.1-14
 - inherit archive limit defaults and pass their to the clamav
   even if they are equal to zero (#428066)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/klamav/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Aug 2007 14:09:24 -0000	1.4
+++ sources	13 Feb 2008 16:43:27 -0000	1.5
@@ -1 +1 @@
-066e4c7089f9ef42958583bd5438e9e2  klamav-0.41.1.tar.bz2
+8e5c4267d56039b105866bad3b44a331  klamav-0.42.tar.bz2