X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=clamav.spec;h=aafdd5584c5585939b2acaae63a4ae14febfd7db;hb=6eda919;hp=cf1293c5287839ff8b73d2abd73c538837105618;hpb=f0c310edc3529c6e532c50f09702fe6106588111;p=packages%2Fclamav.git

diff --git a/clamav.spec b/clamav.spec
index cf1293c..aafdd55 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -10,15 +10,21 @@
 %bcond_without	llvm		# LLVM support
 %endif
 
+%ifarch x32
+%undefine with_llvm
+%endif
+
+%bcond_with	system_llvm
+
 Summary:	An anti-virus utility for Unix
 Summary(pl.UTF-8):	Narzędzie antywirusowe dla Uniksów
 Name:		clamav
-Version:	0.98.4
+Version:	0.99.4
 Release:	1
 License:	GPL v2+
 Group:		Daemons
-Source0:	http://downloads.sourceforge.net/clamav/%{name}-%{version}.tar.gz
-# Source0-md5:	6d409eab6c311de05a0a591fccd2ec83
+Source0:	http://www.clamav.net/downloads/production/%{name}-%{version}.tar.gz
+# Source0-md5:	b9359b90086948b3c4eb97c84cf4b400
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}-milter.init
@@ -28,6 +34,8 @@ Source8:	%{name}-post-updatedb
 Source9:	%{name}-milter.sysconfig
 Source10:	%{name}.tmpfiles
 Source11:	clamd.service
+Source12:	cronjob-clamav.timer
+Source13:	cronjob-clamav.service.in
 Patch0:		%{name}-pld_config.patch
 Patch1:		%{name}-nolibs.patch
 %if "%{pld_release}" == "ac"
@@ -36,20 +44,23 @@ Patch2:		am-nosilentrules.patch
 Patch3:		ac2.68.patch
 Patch4:		%{name}-openssl.patch
 Patch5:		%{name}-major.patch
+Patch6:		x32.patch
 URL:		http://www.clamav.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
+BuildRequires:	check-devel
 BuildRequires:	curl-devel
 BuildRequires:	gmp-devel
 BuildRequires:	libltdl-devel
 %{?with_milter:BuildRequires:	libmilter-devel}
-BuildRequires:	libstdc++-devel
+BuildRequires:	libstdc++-devel >= 5:3.4
 BuildRequires:	libtool
 %{?with_milter:BuildRequires:	libwrap-devel}
-%{?with_llvm:BuildRequires:	llvm-devel}
+%{?with_llvm:%{?with_system_llvm:BuildRequires:	llvm-devel < 3.7}}
 BuildRequires:	ncurses-devel
 BuildRequires:	openssl-devel
+BuildRequires:	pkgconfig
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.647
 BuildRequires:	zlib-devel
@@ -68,7 +79,7 @@ Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	/usr/sbin/usermod
 Requires:	rc-scripts >= 0.4.1.23
 Suggests:	clamav-database
-Suggests:	crondaemon
+Suggests:	cronjobs
 Provides:	group(clamav)
 Provides:	user(clamav)
 Conflicts:	logrotate < 3.7-4
@@ -177,17 +188,22 @@ Biblioteki statyczne clamav.
 %endif
 #%patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
+export CFLAGS="%{rpmcflags} -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99"
+export CXXFLAGS="%{rpmcxxflags} -std=gnu++98"
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
+	--disable-zlib-vcheck \
 	--disable-silent-rules \
 	--disable-clamav \
 	--enable-clamdtop \
+	%{?with_llvm:--enable-llvm %{?with_system_llvm:--with-system-llvm}} \
 	%{?with_milter:--enable-milter} \
 	--with-dbdir=/var/lib/%{name} \
 	--with-no-cache \
@@ -230,6 +246,8 @@ install -p %{SOURCE8} $RPM_BUILD_ROOT%{_sbindir}
 cp -p %{SOURCE10} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
 cp -p %{SOURCE11} $RPM_BUILD_ROOT%{systemdunitdir}
+cp -p %{SOURCE12} $RPM_BUILD_ROOT%{systemdunitdir}/cronjob-%{name}.timer
+sed -e's#@sbindir@#%{_sbindir}#' <  %{SOURCE13} > $RPM_BUILD_ROOT%{systemdunitdir}/cronjob-%{name}.service
 
 # NOTE: clamd uses sane rights to it's clamd.pid file
 # So better keep it dir
@@ -260,14 +278,14 @@ rm -rf $RPM_BUILD_ROOT
 touch /var/log/freshclam.log
 chown clamav:root /var/log/freshclam.log
 chmod 640 /var/log/freshclam.log
-%systemd_post clamd.service
+%systemd_post clamd.service cronjob-clamav.timer
 
 %preun
 if [ "$1" = "0" ]; then
 	%service clamd stop
 	/sbin/chkconfig --del clamd
 fi
-%systemd_preun clamd.service
+%systemd_preun clamd.service cronjob-clamav.timer
 
 %postun
 if [ "$1" = "0" ]; then
@@ -310,6 +328,9 @@ touch /var/lock/subsys/clamd
 %triggerpostun -- %{name} < 0.97.7-4
 %systemd_trigger clamd.service
 
+%triggerpostun -- %{name} < 0.99.2-2
+%systemd_service_enable cronjob-clamav.timer
+
 %post milter
 /sbin/chkconfig --add clamav-milter
 %service clamav-milter restart "Clam Antivirus daemon"
@@ -339,6 +360,8 @@ fi
 %attr(755,root,root) %{_sbindir}/clamav-post-updatedb
 %{systemdtmpfilesdir}/%{name}.conf
 %{systemdunitdir}/clamd.service
+%{systemdunitdir}/cronjob-clamav.service
+%{systemdunitdir}/cronjob-clamav.timer
 %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}
@@ -350,7 +373,9 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/clamd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/clamd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/clamav
-%{_mandir}/man[15]/*
+%{_mandir}/man1/*
+%{_mandir}/man5/clamd*
+%{_mandir}/man5/freshclam*
 %{_mandir}/man8/clamd*
 
 %if %{with milter}
@@ -363,6 +388,7 @@ fi
 #%attr(755,root,root) %{_sysconfdir}/log.d/scripts/services/clamav-milter
 #%{_sysconfdir}/log.d/conf/services/clamav-milter.conf
 %attr(755,root,root) %{_sbindir}/clamav-milter
+%{_mandir}/man5/clamav-milter*
 %{_mandir}/man8/clamav-milter.8*
 %attr(700,clamav,clamav) /var/spool/clamav
 %endif
@@ -370,11 +396,11 @@ fi
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libclamav.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclamav.so.6
+%attr(755,root,root) %ghost %{_libdir}/libclamav.so.7
 %attr(755,root,root) %{_libdir}/libclamunrar.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclamunrar.so.6
+%attr(755,root,root) %ghost %{_libdir}/libclamunrar.so.7
 %attr(755,root,root) %{_libdir}/libclamunrar_iface.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclamunrar_iface.so.6
+%attr(755,root,root) %ghost %{_libdir}/libclamunrar_iface.so.7
 
 %files devel
 %defattr(644,root,root,755)