[packages/clamav] - up to 0.99.1; use internal llvm because for system one < 3.7 is needed (and we already have system

arekm arekm at pld-linux.org
Fri Mar 18 09:33:56 CET 2016


commit 85d2d3389a4b3375c7f61931e5ede409d20813f3
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri Mar 18 09:33:50 2016 +0100

    - up to 0.99.1; use internal llvm because for system one < 3.7 is needed (and we already have system 3.7)

 clamav.spec | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/clamav.spec b/clamav.spec
index 28c5d85..d935d6a 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -14,15 +14,17 @@
 %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.7
-Release:	3
+Version:	0.99.1
+Release:	1
 License:	GPL v2+
 Group:		Daemons
 Source0:	http://downloads.sourceforge.net/clamav/%{name}-%{version}.tar.gz
-# Source0-md5:	157c601161da1c2d5a0e48ea1b49e067
+# Source0-md5:	cf1f3cbe62a08c9165801f79239166ff
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}-milter.init
@@ -52,7 +54,7 @@ BuildRequires:	libltdl-devel
 BuildRequires:	libstdc++-devel
 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:	rpm >= 4.4.9-56
@@ -194,7 +196,7 @@ Biblioteki statyczne clamav.
 	--disable-silent-rules \
 	--disable-clamav \
 	--enable-clamdtop \
-	%{?with_llvm:--enable-llvm --with-system-llvm} \
+	%{?with_llvm:--enable-llvm %{?with_system_llvm:--with-system-llvm}} \
 	%{?with_milter:--enable-milter} \
 	--with-dbdir=/var/lib/%{name} \
 	--with-no-cache \
@@ -377,11 +379,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)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/clamav.git/commitdiff/85d2d3389a4b3375c7f61931e5ede409d20813f3



More information about the pld-cvs-commit mailing list