rpms/klamav/F-7 klamav-0.41.1-no-sqlite.patch, NONE, 1.1 klamav-0.41.1-pwd-echo.patch, NONE, 1.1 klamav.spec, 1.4, 1.5

[Andy Shevchenko (andriy)]

Author: andriy

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

Modified Files:
	klamav.spec 
Added Files:
	klamav-0.41.1-no-sqlite.patch klamav-0.41.1-pwd-echo.patch 
Log Message:
Try to fix #362061

klamav-0.41.1-no-sqlite.patch:

--- NEW FILE klamav-0.41.1-no-sqlite.patch ---
--- klamav-0.41.1/src/Makefile.am.no-sqlite	2007-07-24 22:51:54.000000000 +0300
+++ klamav-0.41.1/src/Makefile.am	2007-11-07 16:06:50.000000000 +0200
@@ -9,7 +9,7 @@ endif
 # of the other Makefile.am variables
 bin_PROGRAMS = klamav
 
-SUBDIRS=icons klammail klamd about action arkollon sqlite .
+SUBDIRS=icons klammail klamd about action arkollon .
 
 # set the include path for X, qt and KDE
 INCLUDES         = $(all_includes)
--- klamav-0.41.1/src/Makefile.in.no-sqlite	2007-07-24 22:51:54.000000000 +0300
+++ klamav-0.41.1/src/Makefile.in	2007-11-07 16:06:56.000000000 +0200
@@ -403,7 +403,7 @@ xdg_menudir = @xdg_menudir@
 @with_included_sqlite_TRUE at SQLITE_SUBDIR = sqlite
 @with_included_sqlite_TRUE at LIB_SQLITE_LOCAL = sqlite/libsqlite.la
 @with_included_sqlite_TRUE at sqlite_includes = -Isqlite
-SUBDIRS = icons klammail klamd about action arkollon sqlite .
+SUBDIRS = icons klammail klamd about action arkollon .
 
 # set the include path for X, qt and KDE
 INCLUDES = $(all_includes)

klamav-0.41.1-pwd-echo.patch:

--- NEW FILE klamav-0.41.1-pwd-echo.patch ---
--- klamav-0.41.1/src/freshklam.cpp.pwd-echo	2007-07-24 22:51:54.000000000 +0300
+++ klamav-0.41.1/src/freshklam.cpp	2007-11-07 15:53:51.000000000 +0200
@@ -225,6 +225,7 @@ Freshklam::Freshklam(QWidget *parent, co
     //proxy_pass_label->setFixedSize(proxy_pass_label->sizeHint());
     proxy_dir_layout->addWidget(proxy_pass_label,1,3);
     proxyPass = new KLineEdit(proxy_hlp);
+    proxyPass->setEchoMode(KLineEdit::Password);
     proxy_dir_layout->addWidget(proxyPass,1,4);
     proxyPass->setText(proxyPassText);
     


Index: klamav.spec
===================================================================
RCS file: /cvs/extras/rpms/klamav/F-7/klamav.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- klamav.spec	5 Sep 2007 09:29:09 -0000	1.4
+++ klamav.spec	7 Nov 2007 15:36:20 -0000	1.5
@@ -1,10 +1,12 @@
 Summary: Clam Anti-Virus on the KDE Desktop
 Name: klamav
 Version: 0.41.1
-Release: 5%{?dist}
+Release: 6%{?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
 URL: http://klamav.sourceforge.net
 Group: Applications/System
 License: GPLv2+
@@ -25,6 +27,8 @@
 %setup -q
 %patch0 -p0 -b .suse-clamav-path
 %patch1 -p1 -b .open-mode
+%patch2 -p1 -b .no-sqlite
+%patch3 -p1 -b .pwd-echo
 
 %build
 %configure --disable-rpath --without-included-sqlite
@@ -80,6 +84,10 @@
 %{_datadir}/icons/*/*x*/apps/klamav.png
 
 %changelog
+* Wed Nov 07 2007 Andy Shevchenko <andy at smile.org.ua> 0.41.1-6
+- do not build internal sqlite
+- set special echo mode for password field (#362061)
+
 * Sun Aug 19 2007 Andy Shevchenko <andy at smile.org.ua> 0.41.1-5
 - fix desktop Categories
 - use system sqlite