- -database as separate spec

Changed files:
    clamav.spec -> 1.200

diff --git a/clamav.spec b/clamav.spec
index 8f7048149e100f8e75c86dbe49e582c6f592a429..08552b84eb82dd34be7556f9e8b7974e039c68fd 100644 (file)
--- a/clamav.spec
+++ b/clamav.spec
@@ -1,19 +1,16 @@
 # 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
@@ -25,15 +22,7 @@ Source2:     %{name}.sysconfig
 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
@@ -70,14 +59,14 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 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
@@ -134,21 +123,8 @@ clamav static libraries.
 %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
@@ -194,13 +170,7 @@ install %{SOURCE4} $RPM_BUILD_ROOT%{_sbindir}/clamav-cron-updatedb
 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
@@ -308,8 +278,6 @@ fi
 %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
@@ -320,7 +288,9 @@ fi
 %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}
 
@@ -362,10 +332,3 @@ fi
 %files static
 %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