X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=clamav.spec;h=031cb5aa87b3c53a95f7405f960eaa1674470c91;hb=02c8fe2bdb0ba455371a177791b6b1b238a60356;hp=391cfb44d376df077c6be834df42ff5bbd2c9f60;hpb=da7bf284dba111ca98b92dc889919af9fc3e1716;p=packages%2Fclamav.git

diff --git a/clamav.spec b/clamav.spec
index 391cfb4..031cb5a 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -11,6 +11,7 @@
 %endif
 %bcond_without	system_libmspack	# system libmspack library
 %bcond_with	system_llvm		# system LLVM (< 3.7)
+%bcond_without	static_libs		# static libraries
 
 %ifarch x32
 %undefine with_llvm
@@ -18,13 +19,13 @@
 Summary:	An anti-virus utility for Unix
 Summary(pl.UTF-8):	Narzędzie antywirusowe dla Uniksów
 Name:		clamav
-Version:	0.101.0
-Release:	5
+Version:	0.103.0
+Release:	2
 License:	GPL v2+
 Group:		Daemons
 #Source0Download: http://www.clamav.net/download
 Source0:	http://www.clamav.net/downloads/production/%{name}-%{version}.tar.gz
-# Source0-md5:	47c36d13ac814b9e29ed6f5fc1691373
+# Source0-md5:	453a389e0147b5df8fae5601b390d7db
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}-milter.init
@@ -42,30 +43,28 @@ Patch1:		%{name}-nolibs.patch
 Patch2:		am-nosilentrules.patch
 %endif
 Patch3:		ac2.68.patch
-Patch4:		%{name}-openssl.patch
-Patch5:		%{name}-major.patch
-Patch6:		x32.patch
-Patch7:		%{name}-add-support-for-system-tomsfastmath.patch
-Patch8:		%{name}-headers.patch
+Patch4:		x32.patch
+Patch5:		%{name}-add-support-for-system-tomsfastmath.patch
+Patch6:		%{name}-headers.patch
 URL:		http://www.clamav.net/
 BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake >= 1:1.11
-BuildRequires:	bzip2-devel
+BuildRequires:	automake >= 1:1.11.1
+BuildRequires:	bzip2-devel >= 1.0.5
 BuildRequires:	check-devel
-BuildRequires:	curl-devel
+BuildRequires:	curl-devel >= 7.40
 BuildRequires:	gmp-devel
 BuildRequires:	json-c-devel
 BuildRequires:	libltdl-devel
 %{?with_milter:BuildRequires:	libmilter-devel}
 %{?with_system_libmspack:BuildRequires:	libmspack-devel}
 BuildRequires:	libstdc++-devel >= 5:3.4
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:2
 %{?with_milter:BuildRequires:	libwrap-devel}
 BuildRequires:	libxml2-devel >= 2
 %{?with_llvm:%{?with_system_llvm:BuildRequires:	llvm-devel < 3.7}}
 BuildRequires:	ncurses-devel
 BuildRequires:	openssl-devel >= 0.9.8
-BuildRequires:	pcre2-8-devel
+BuildRequires:	pcre2-8-devel >= 10.30
 BuildRequires:	pkgconfig >= 1:0.16
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.647
@@ -153,6 +152,9 @@ Lista podstawowych możliwości:
 Summary:	Shared libraries for clamav
 Summary(pl.UTF-8):	Biblioteki dzielone clamav
 Group:		Libraries
+Requires:	bzip2-libs >= 1.0.5
+Requires:	curl-libs >= 7.40
+Requires:	pcre2-8 >= 10.30
 Requires:	zlib >= 1.2.2
 
 %description libs
@@ -181,10 +183,11 @@ Summary:	clamav - Development header files and libraries
 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
-Requires:	curl-devel
+Requires:	bzip2-devel >= 1.0.5
+Requires:	curl-devel >= 7.40
 Requires:	gmp-devel
 Requires:	openssl-devel >= 0.9.8
+Requires:	pcre2-8-devel >= 10.30
 Requires:	zlib-devel >= 1.2.2
 
 %description devel
@@ -217,11 +220,9 @@ Biblioteki statyczne clamav.
 %if "%{pld_release}" != "ac"
 %patch3 -p1
 %endif
-#%patch4 -p1
+%patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
 
 %build
 export CFLAGS="%{rpmcflags} -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99"
@@ -233,10 +234,12 @@ export CXXFLAGS="%{rpmcxxflags} -std=gnu++98"
 %{__automake}
 %configure \
 	--disable-clamav \
+	--enable-clamonacc \
 	--enable-clamdtop \
 	%{?with_llvm:--enable-llvm %{!?with_system_llvm:--with-system-llvm=no}} \
 	%{?with_milter:--enable-milter} \
 	--disable-silent-rules \
+	%{?with_static_libs:--enable-static} \
 	--disable-zlib-vcheck \
 	--with-dbdir=/var/lib/%{name} \
 	--with-ltdl-include=%{_includedir} \
@@ -244,8 +247,7 @@ export CXXFLAGS="%{rpmcxxflags} -std=gnu++98"
 	--with-no-cache \
 	%{?with_system_libmspack:--with-system-libmspack}
 
-%{__make} \
-	LIBTOOL=%{_bindir}/libtool
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -255,7 +257,6 @@ install -d $RPM_BUILD_ROOT/etc/{cron.d,logrotate.d,rc.d/init.d,sysconfig} \
 	$RPM_BUILD_ROOT%{systemdunitdir}
 
 %{__make} install \
-	LIBTOOL=%{_bindir}/libtool \
 	DESTDIR=$RPM_BUILD_ROOT
 %{!?with_milter:rm -f $RPM_BUILD_ROOT%{_mandir}/man8/clamav-milter.8*}
 
@@ -389,10 +390,12 @@ fi
 %attr(755,root,root) %{_bindir}/freshclam
 %attr(755,root,root) %{_bindir}/sigtool
 %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,root,root) %{_sbindir}/clamd
+%attr(755,root,root) %{_sbindir}/clamonacc
 %{systemdtmpfilesdir}/%{name}.conf
+%{systemdunitdir}/clamav-clamonacc.service
 %{systemdunitdir}/clamav-daemon.service
 %{systemdunitdir}/clamav-daemon.socket
 %{systemdunitdir}/clamav-freshclam.service
@@ -410,10 +413,18 @@ 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}/man1/*
-%{_mandir}/man5/clamd*
-%{_mandir}/man5/freshclam*
-%{_mandir}/man8/clamd*
+%{_mandir}/man1/clambc.1*
+%{_mandir}/man1/clamconf.1*
+%{_mandir}/man1/clamdscan.1*
+%{_mandir}/man1/clamdtop.1*
+%{_mandir}/man1/clamscan.1*
+%{_mandir}/man1/clamsubmit.1*
+%{_mandir}/man1/freshclam.1*
+%{_mandir}/man1/sigtool.1*
+%{_mandir}/man5/clamd.conf.5*
+%{_mandir}/man5/freshclam.conf.5*
+%{_mandir}/man8/clamd.8*
+%{_mandir}/man8/clamonacc.8*
 
 %if %{with milter}
 %files milter
@@ -422,10 +433,8 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/clamav-milter.conf
 %attr(754,root,root) /etc/rc.d/init.d/clamav-milter
 #%attr(755,root,root) %{_sysconfdir}/cron.daily/clamav-milter
-#%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}/man5/clamav-milter.conf.5*
 %{_mandir}/man8/clamav-milter.8*
 %attr(700,clamav,clamav) /var/spool/clamav
 %endif
@@ -442,6 +451,8 @@ fi
 %attr(755,root,root) %ghost %{_libdir}/libclamunrar.so.9
 %attr(755,root,root) %{_libdir}/libclamunrar_iface.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libclamunrar_iface.so.9
+%attr(755,root,root) %{_libdir}/libfreshclam.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfreshclam.so.2
 
 %files devel
 %defattr(644,root,root,755)
@@ -451,18 +462,20 @@ fi
 %attr(755,root,root) %{_libdir}/libclammspack.so
 %endif
 %attr(755,root,root) %{_libdir}/libclamunrar.so
+%attr(755,root,root) %{_libdir}/libfreshclam.so
 %attr(755,root,root) %{_libdir}/libclamunrar_iface.so
 %{_libdir}/libclamav.la
 %if %{without system_libmspack}
 %{_libdir}/libclammspack.la
 %endif
 %{_libdir}/libclamunrar.la
+%{_libdir}/libfreshclam.la
 %{_libdir}/libclamunrar_iface.la
 %dir %{_includedir}/clamav
 %{_includedir}/clamav/clamav.h
-%{_includedir}/clamav/clamav-config.h
-%{_includedir}/clamav/cltypes.h
-%{_includedir}/clamav/platform.h
+%{_includedir}/clamav/clamav-types.h
+%{_includedir}/clamav/clamav-version.h
+%{_includedir}/clamav/libfreshclam.h
 %{_pkgconfigdir}/libclamav.pc
 
 %files static
@@ -472,4 +485,5 @@ fi
 %{_libdir}/libclammspack.a
 %endif
 %{_libdir}/libclamunrar.a
+%{_libdir}/libfreshclam.a
 %{_libdir}/libclamunrar_iface.a