Accepting request 790518 from home:pluskalm:branches:security

- Drop python build dependency as it is not needed

OBS-URL: https://build.opensuse.org/request/show/790518
OBS-URL: https://build.opensuse.org/package/show/security/clamav?expand=0&rev=203
This commit is contained in:
Lars Vogdt 2020-04-15 20:39:04 +00:00 committed by Git OBS Bridge
parent 201de5a035
commit 2f95031a55
2 changed files with 15 additions and 12 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Apr 1 10:01:36 UTC 2020 - Martin Pluskal <mpluskal@suse.com>
- Drop python build dependency as it is not needed
-------------------------------------------------------------------
Wed Feb 5 18:31:17 UTC 2020 - Arjen de Korte <suse+build@de-korte.org>

View File

@ -16,9 +16,8 @@
#
%bcond_with clammspack
%define clamav_check --enable-check
%bcond_with clammspack
Name: clamav
Version: 0.102.2
Release: 0
@ -47,9 +46,6 @@ BuildRequires: gcc-c++
BuildRequires: libbz2-devel
BuildRequires: libcurl-devel
BuildRequires: libjson-c-devel
%if %{without clammspack}
BuildRequires: libmspack-devel
%endif
BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: libxml2-devel
@ -57,7 +53,6 @@ BuildRequires: ncurses-devel
BuildRequires: pcre2-devel
BuildRequires: pkgconfig
BuildRequires: pwdutils
BuildRequires: python-devel
BuildRequires: sed
BuildRequires: sendmail-devel
BuildRequires: systemd-rpm-macros
@ -73,6 +68,9 @@ Obsoletes: clamav-db < 0.88.3
Provides: clamav-nodb = %version
Obsoletes: clamav-nodb <= 0.98.4
%systemd_requires
%if %{without clammspack}
BuildRequires: libmspack-devel
%endif
%description
ClamAV is an antivirus engine designed for detecting trojans,
@ -142,7 +140,7 @@ CFLAGS="$CFLAGS -DFP_64BIT"
%configure \
--disable-clamav \
--disable-static \
--with-dbdir=/var/lib/clamav \
--with-dbdir=%{_localstatedir}/lib/clamav \
--with-user=vscan \
--with-group=vscan \
--enable-milter \
@ -159,10 +157,10 @@ make V=1 %?_smp_mflags
%install
%make_install
install -d -m755 %buildroot/var/lib/clamav
install -d -m755 %buildroot%{_localstatedir}/lib/clamav
install -d -m755 %buildroot/%_tmpfilesdir
install -m644 %SOURCE6 %buildroot%_tmpfilesdir/clamav.conf
mkdir -p %buildroot/var/spool/amavis
mkdir -p %buildroot%{_localstatedir}/spool/amavis
mkdir -p -m 0755 %buildroot/run/clamav
find %buildroot -type f -name "*.la" -delete -print
@ -219,8 +217,8 @@ VALGRIND_GENSUP=1 make check
%_bindir/*
%_sbindir/*
%defattr(-,vscan,vscan)
%dir %attr(750,vscan,vscan) /var/spool/amavis
%dir /var/lib/clamav
%dir %attr(750,vscan,vscan) %{_localstatedir}/spool/amavis
%dir %{_localstatedir}/lib/clamav
%ghost %attr(755,vscan,vscan) /run/clamav
%files -n libclamav9
@ -244,7 +242,7 @@ VALGRIND_GENSUP=1 make check
getent group vscan >/dev/null || %_sbindir/groupadd -r vscan
getent passwd vscan >/dev/null || \
%_sbindir/useradd -r -o -g vscan -u 65 -s /bin/false \
-c "Vscan account" -d /var/spool/amavis vscan
-c "Vscan account" -d %{_localstatedir}/spool/amavis vscan
%_sbindir/usermod vscan -g vscan
%service_add_pre clamd.service freshclam.service clamav-milter.service