- update to 0.90-stable

[packages/clamav.git] / clamav.spec

diff --git a/clamav.spec b/clamav.spec
index 08552b84eb82dd34be7556f9e8b7974e039c68fd..f7baac1d15c824b787c01efdff7b5779a1e5ad37 100644 (file)
--- a/clamav.spec
+++ b/clamav.spec
@@ -5,18 +5,16 @@
 %bcond_without milter          # build without milter subpackage
 %bcond_with    curl            # enable curl support
 #
-%define                _rc             rc2
-%define                _rel    0.11
 Summary:       An anti-virus utility for Unix
-Summary(pl):   Narzêdzie antywirusowe dla Uniksów
+Summary(pl.UTF-8):     Narzędzie antywirusowe dla Uniksów
 Name:          clamav
 Version:       0.90
-Release:       0.%{_rc}.%{_rel}
+Release:       1
 Epoch:         0
 License:       GPL
 Group:         Applications
-Source0:       http://dl.sourceforge.net/clamav/%{name}-%{version}%{_rc}.tar.gz
-# Source0-md5: 91da47456ed28a7cfbfe17b033e15121
+Source0:       http://dl.sourceforge.net/clamav/%{name}-%{version}.tar.gz
+# Source0-md5: f04372e49c3c5ff3bd94bbe1fef2eaca
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}-milter.init
@@ -27,16 +25,17 @@ Source9:    %{name}-milter.sysconfig
 Patch0:                %{name}-pld_config.patch
 Patch1:                %{name}-no_auto_libwrap.patch
 Patch2:                %{name}-nolibs.patch
+Patch3:                %{name}-find_milter.patch
 URL:           http://www.clamav.net/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bzip2-devel
 %{?with_curl:BuildRequires:    curl-devel}
 BuildRequires: gmp-devel
+%{?with_milter:BuildRequires:  libmilter-devel}
 BuildRequires: libtool
 %{?with_milter:BuildRequires:  libwrap-devel}
 BuildRequires: rpmbuild(macros) >= 1.268
-%{?with_milter:BuildRequires:  sendmail-devel >= 8.11}
 BuildRequires: zlib-devel
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
@@ -62,27 +61,27 @@ for auto-updating with support for digital signatures. The virus
 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
+%description -l pl.UTF-8
+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 85387 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
 Summary:       Shared libraries for clamav
-Summary(pl):   Biblioteki dzielone clamav
+Summary(pl.UTF-8):     Biblioteki dzielone clamav
 Group:         Libraries
 
 %description libs
 Shared libraries for clamav.
 
-%description libs -l pl
+%description libs -l pl.UTF-8
 Biblioteki dzielone clamav.
 
 %package milter
 Summary:       ClamAV filter using milter interface
-Summary(pl):   Filtr ClamAV korzystaj±cy z interfejsu milter
+Summary(pl.UTF-8):     Filtr ClamAV korzystający z interfejsu milter
 Group:         Daemons
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      sendmail >= 8.11
@@ -91,12 +90,12 @@ Requires:   tcp_wrappers
 %description milter
 ClamAV sendmail filter using MILTER interface.
 
-%description milter -l pl
-Filtr ClamAV dla sendmaila korzystaj±cy z interfejsu MILTER.
+%description milter -l pl.UTF-8
+Filtr ClamAV dla sendmaila korzystający z interfejsu MILTER.
 
 %package devel
 Summary:       clamav - Development header files and libraries
-Summary(pl):   clamav - Pliki nag³ówkowe i biblioteki dla programistów
+Summary(pl.UTF-8):     clamav - Pliki nagłówkowe i biblioteki dla programistów
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      bzip2-devel
@@ -107,20 +106,20 @@ Requires: zlib-devel
 This package contains the development header files and libraries
 necessary to develop clamav client applications.
 
-%description devel -l pl
-Pliki nag³ówkowe i biblioteki konieczne do kompilacji aplikacji
+%description devel -l pl.UTF-8
+Pliki nagłówkowe i biblioteki konieczne do kompilacji aplikacji
 klienckich clamav.
 
 %package static
 Summary:       clamav static libraries
-Summary(pl):   Biblioteki statyczne clamav
+Summary(pl.UTF-8):     Biblioteki statyczne clamav
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 clamav static libraries.
 
-%description static -l pl
+%description static -l pl.UTF-8
 Biblioteki statyczne clamav.
 
 %prep
@@ -128,11 +127,7 @@ Biblioteki statyczne clamav.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-
-# kill old libtool.m4 copy
-head -n 489 acinclude.m4 > acinclude.m4.tmp
-tail -n +4089 acinclude.m4 >> acinclude.m4.tmp
-mv -f acinclude.m4.tmp acinclude.m4
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -254,6 +249,8 @@ fi
                s,^ClamukoScanOnOpen$,& yes,
                s,^ClamukoScanOnClose$,& yes,
                s,^ClamukoScanOnExec$,& yes,
+               s,^LogTime$,& yes,
+               s,^ScanPE$,& yes,
 ' /etc/clamd.conf
 %banner -e %{name}-0.90 <<EOF
 ClamAV config was automatically upgraded to 0.90 format. You should review it