- Unclutter the spec file.

OBS-URL: https://build.opensuse.org/package/show/security/clamav?expand=0&rev=175
This commit is contained in:
Reinhard Max 2018-07-31 12:08:01 +00:00 committed by Git OBS Bridge
parent c8e2e69a0c
commit c59655e8e2
2 changed files with 7 additions and 6 deletions

View File

@ -4,6 +4,7 @@ Tue Jul 31 08:43:39 UTC 2018 - max@suse.com
- bsc#1101654: Disable YARA support for licensing reasons
(clamav-disable-yara.patch).
- Do not ignore errors from useradd et al.
- Unclutter the spec file.
-------------------------------------------------------------------
Wed Jul 25 16:23:09 UTC 2018 - mpluskal@suse.com

View File

@ -125,7 +125,7 @@ CFLAGS="$CFLAGS -DFP_64BIT"
%configure \
--disable-clamav \
--disable-static \
--with-dbdir=%_localstatedir/lib/clamav \
--with-dbdir=/var/lib/clamav \
--with-user=vscan \
--with-group=vscan \
--enable-milter \
@ -139,10 +139,10 @@ make V=1 %?_smp_mflags
%install
%make_install
install -d -m755 %buildroot%_localstatedir/lib/clamav
install -d -m755 %buildroot/var/lib/clamav
install -d -m755 %buildroot/%_tmpfilesdir
install -m644 %SOURCE6 %buildroot%_tmpfilesdir/clamav.conf
mkdir -p %buildroot%_localstatedir/spool/amavis
mkdir -p %buildroot/var/spool/amavis
mkdir -p -m 0755 %buildroot/run/clamav
find %buildroot -type f -name "*.la" -delete -print
@ -197,8 +197,8 @@ VALGRIND_GENSUP=1 make check
%_bindir/*
%_sbindir/*
%defattr(-,vscan,vscan)
%dir %attr(750,vscan,vscan) %_localstatedir/spool/amavis
%dir %_localstatedir/lib/clamav
%dir %attr(750,vscan,vscan) /var/spool/amavis
%dir /var/lib/clamav
%ghost %attr(755,vscan,vscan) /run/clamav
%files -n libclamav7
@ -216,7 +216,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 %_localstatedir/spool/amavis vscan
-c "Vscan account" -d /var/spool/amavis vscan
%_sbindir/usermod vscan -g vscan
%service_add_pre clamd.service freshclam.service clamav-milter.service