SPECS: clamav.spec - -database as separate spec

[glen]

Author: glen                         Date: Wed Dec 27 11:50:02 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- -database as separate spec

---- Files affected:
SPECS:
   clamav.spec (1.199 -> 1.200) 

---- Diffs:

================================================================
Index: SPECS/clamav.spec
diff -u SPECS/clamav.spec:1.199 SPECS/clamav.spec:1.200
--- SPECS/clamav.spec:1.199	Mon Nov  6 10:11:29 2006
+++ SPECS/clamav.spec	Wed Dec 27 12:49:57 2006
@@ -1,20 +1,17 @@
 # $Revision$, $Date$
 # TODO:
-# - Make freshclam (script and daemon)
-# - check how the "scripted updates" work (instead of old full cvd download)
+# - Make freshclam package (script and daemon)
 #
 # Conditional build:
 %bcond_without	milter		# build without milter subpackage
-%bcond_without	database	# build without databases subpackage
 %bcond_with	curl		# enable curl support
 #
-%define		_ver	0.90
-%define		_rc	rc2
-%define		_rel	0.10
+%define		_rc		rc2
+%define		_rel	0.11
 Summary:	An anti-virus utility for Unix
 Summary(pl):	Narzędzie antywirusowe dla Uniksów
 Name:		clamav
-Version:	%{_ver}
+Version:	0.90
 Release:	0.%{_rc}.%{_rel}
 Epoch:		0
 License:	GPL
@@ -26,15 +23,7 @@
 Source3:	%{name}-milter.init
 Source4:	%{name}-cron-updatedb
 Source5:	%{name}.logrotate
-%if %{with database}
-# Remember to update date after databases upgrade
-%define		database_version	20061105
-Source6:	http://db.local.clamav.net/daily.cvd
-# Source6-md5:	a39e9288913b4bae43823bf9d1bfad76
-Source7:	http://db.local.clamav.net/main.cvd
-# Source7-md5:	347c99544205184fbc1bd23fd7cfd782
 Source8:	%{name}-post-updatedb
-%endif # database
 Source9:	%{name}-milter.sysconfig
 Patch0:		%{name}-pld_config.patch
 Patch1:		%{name}-no_auto_libwrap.patch
@@ -71,14 +60,14 @@
 Clam Antivirus is a powerful anti-virus scanner for Unix. It supports
 AMaViS, compressed files, on-access scanning and includes a program
 for auto-updating with support for digital signatures. The virus
-database has over 34000 viruses, worms and trojans signatures. The
+database has over 85387 viruses, worms and trojans signatures. The
 scanner is multithreaded, written in C, and POSIX compliant.
 
 %description -l pl
 Clam Antivirus jest potężnym skanerem antywirusowym dla systemów
 uniksowych. Wspiera on AMaViSa, skompresowane pliki, skanowanie
 "on-access" i posiada system bezpiecznej, automatycznej aktualizacji.
-Baza wirusów zawiera ponad 34000 sygnatur. Skaner jest wielowątkowy,
+Baza wirusów zawiera ponad 85387 sygnatur. Skaner jest wielowątkowy,
 napisany w C i zgodny z POSIXem.
 
 %package libs
@@ -135,21 +124,8 @@
 %description static -l pl
 Biblioteki statyczne clamav.
 
-%package database
-Summary:	Virus database for clamav
-Summary(pl):	Bazy wirusów dla clamav
-Version:	%{_ver}.%{database_version}
-Group:		Applications/Databases
-Requires:	%{name}
-
-%description database
-Virus database for clamav (updated %{database_version}).
-
-%description database -l pl
-Bazy wirusów dla clamav (aktualizowana %{database_version}).
-
 %prep
-%setup -q %{?_rc:-n %{name}-%{_ver}%{_rc}}
+%setup -q %{?_rc:-n %{name}-%{version}%{_rc}}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -195,13 +171,7 @@
 install etc/*.conf $RPM_BUILD_ROOT%{_sysconfdir}
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 
-%if %{with database}
-install %{SOURCE6} $RPM_BUILD_ROOT/var/lib/%{name}
-install %{SOURCE7} $RPM_BUILD_ROOT/var/lib/%{name}
 install %{SOURCE8} $RPM_BUILD_ROOT%{_sbindir}
-%else
-rm -f $RPM_BUILD_ROOT/var/lib/%{name}/{main,daily}.cvd
-%endif
 
 # NOTE: clamd uses sane rights to it's clamd.pid file
 # So better keep it dir
@@ -309,8 +279,6 @@
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
-%post	database -p %{_sbindir}/%{name}-post-updatedb
-
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog FAQ NEWS README TODO docs/*.pdf
@@ -321,7 +289,9 @@
 %attr(755,root,root) %{_bindir}/clamconf
 %attr(755,root,root) %{_sbindir}/clamd
 %attr(755,root,root) %{_sbindir}/clamav-cron-updatedb
+%attr(755,root,root) %{_sbindir}/clamav-post-updatedb
 %attr(755,clamav,root) %dir /var/lib/%{name}
+%ghost %attr(644,clamav,root) %verify(not md5 mtime size) /var/lib/clamav/*.cvd
 %attr(640,clamav,root) %ghost /var/log/freshclam.log
 %attr(750,clamav,clamav) %dir /var/run/%{name}
 
@@ -364,19 +334,15 @@
 %defattr(644,root,root,755)
 %{_libdir}/*.a
 
-%if %{with database}
-%files database
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/clamav-post-updatedb
-%attr(644,clamav,root) %verify(not md5 mtime size) /var/lib/%{name}/*.cvd
-%endif # database
-
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.200  2006/12/27 11:49:57  glen
+- -database as separate spec
+
 Revision 1.199  2006/11/06 09:11:29  glen
 - always upgrade config, add banner and always restart clamd after trigger
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/clamav.spec?r1=1.199&r2=1.200&f=u