Author: glen Date: Wed Dec 27 12:06:33 2006 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- -database available as separately; rel 3
---- Files affected:
SPECS:
clamav.spec (1.192.2.3 -> 1.192.2.4)
---- Diffs:
================================================================
Index: SPECS/clamav.spec
diff -u SPECS/clamav.spec:1.192.2.3 SPECS/clamav.spec:1.192.2.4
--- SPECS/clamav.spec:1.192.2.3 Wed Dec 27 12:27:32 2006
+++ SPECS/clamav.spec Wed Dec 27 13:06:28 2006
@@ -1,14 +1,13 @@
# $Revision$, $Date$
# Conditional build:
%bcond_without milter # build without milter subpackage
-%bcond_without database # build without databases subpackage
%bcond_with curl # enable curl support
#
Summary: An anti-virus utility for Unix
Summary(pl): Narzędzie antywirusowe dla Uniksów
Name: clamav
Version: 0.88.7
-Release: 2
+Release: 3
Epoch: 0
License: GPL
Group: Applications
@@ -19,15 +18,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 20060808
-Source6: http://db.local.clamav.net/daily.cvd
-# Source6-md5: 78f17167c67776470db9886fc2a07e28
-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
@@ -64,14 +55,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
@@ -128,19 +119,6 @@
%description static -l pl
Biblioteki statyczne clamav.
-%package database
-Summary: Virus database for clamav
-Summary(pl): Bazy wirusów dla clamav
-Version: %{version}.%{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
%patch0 -p1
@@ -174,7 +152,7 @@
DESTDIR=$RPM_BUILD_ROOT
%{!?with_milter:rm -f $RPM_BUILD_ROOT%{_mandir}/man8/clamav-milter.8*}
-cat <<EOF >$RPM_BUILD_ROOT/etc/cron.d/%{name}
+cat <<'EOF' >$RPM_BUILD_ROOT/etc/cron.d/%{name}
5 * * * * root %{_sbindir}/clamav-cron-updatedb
EOF
@@ -188,20 +166,14 @@
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
# If it is fixed use of dir will be unecesary
-install -d $RPM_BUILD_ROOT%{_var}/run/%{name}
+install -d $RPM_BUILD_ROOT/var/run/%{name}
-:> $RPM_BUILD_ROOT%{_var}/log/freshclam.log
+:> $RPM_BUILD_ROOT/var/log/freshclam.log
%clean
rm -rf $RPM_BUILD_ROOT
@@ -244,9 +216,9 @@
%post
/sbin/chkconfig --add clamd
%service clamd restart "Clam Antivirus daemon"
-touch %{_var}/log/freshclam.log
-chown clamav:root %{_var}/log/freshclam.log
-chmod 640 %{_var}/log/freshclam.log
+touch /var/log/freshclam.log
+chown clamav:root /var/log/freshclam.log
+chmod 640 /var/log/freshclam.log
%preun
if [ "$1" = "0" ]; then
@@ -266,7 +238,7 @@
mv -f /etc/clamd.conf /etc/clamd.conf.rpmnew
mv -f /etc/clamav.conf.rpmsave /etc/clamd.conf
echo "Changing config location in freshclam config"
- sed -i -e 's/clamav.conf/clamd.conf/' /etc/freshclam.conf
+ %{__sed} -i -e 's/clamav.conf/clamd.conf/' /etc/freshclam.conf
fi
%post milter
@@ -282,8 +254,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
@@ -293,11 +263,13 @@
%attr(755,root,root) %{_bindir}/sigtool
%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}
-%attr(640,clamav,root) %ghost %{_var}/log/freshclam.log
-%attr(750,clamav,clamav) %dir %{_var}/run/%{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}
-%attr(640,root,root) /etc/cron.d/%{name}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/cron.d/%{name}
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/clamd.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/freshclam.conf
@@ -336,19 +308,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 <[EMAIL PROTECTED]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.192.2.4 2006/12/27 12:06:28 glen
+- -database available as separately; rel 3
+
Revision 1.192.2.3 2006/12/27 11:27:32 glen
- rel 2: fixed clamav-cron-updatedb notify when clamd is down on purpose
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/clamav.spec?r1=1.192.2.3&r2=1.192.2.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
