| |
@@ -117,9 +117,9 @@
|
| |
#for milter
|
| |
BuildRequires: sendmail-devel
|
| |
|
| |
- Requires: clamav-filesystem = %version-%release
|
| |
+ # clamav requires clamav-lib, clamav-lib requires data(clamav)
|
| |
+ # data(clamav) requires clamav-filesystem
|
| |
Requires: clamav-lib = %version-%release
|
| |
- Requires: data(clamav)
|
| |
|
| |
%description
|
| |
Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this
|
| |
@@ -413,16 +413,6 @@
|
| |
make check
|
| |
|
| |
|
| |
- %post
|
| |
- %systemd_post clamonacc.service
|
| |
-
|
| |
- %preun
|
| |
- %systemd_preun clamonacc.service
|
| |
-
|
| |
- %postun
|
| |
- %systemd_postun_with_restart clamonacc.service
|
| |
-
|
| |
-
|
| |
%pre filesystem
|
| |
getent group %{updateuser} >/dev/null || groupadd -r %{updateuser}
|
| |
getent passwd %{updateuser} >/dev/null || \
|
| |
@@ -447,12 +437,15 @@
|
| |
ln -sf /usr/lib/systemd/system/clamd@.service /etc/systemd/system/multi-user.target.wants/clamd@scan.service || :
|
| |
%systemd_post clamd@scan.service
|
| |
%{?with_tmpfiles:/bin/systemd-tmpfiles --create %_tmpfilesdir/clamd.scan.conf || :}
|
| |
+ %systemd_post clamonacc.service
|
| |
|
| |
%preun -n clamd
|
| |
%systemd_preun clamd@scan.service
|
| |
+ %systemd_preun clamonacc.service
|
| |
|
| |
%postun -n clamd
|
| |
%systemd_postun_with_restart clamd@scan.service
|
| |
+ %systemd_postun_with_restart clamonacc.service
|
| |
|
| |
|
| |
%triggerin milter -- clamav-scanner
|
| |
@@ -518,16 +511,12 @@
|
| |
%_bindir/clamconf
|
| |
%_bindir/clamdscan
|
| |
%_bindir/clamdtop
|
| |
- %if %{with clamonacc}
|
| |
- %_bindir/clamonacc
|
| |
- %endif
|
| |
%_bindir/clamscan
|
| |
%_bindir/clamsubmit
|
| |
%_bindir/sigtool
|
| |
%_mandir/man[15]/*
|
| |
%exclude %_mandir/*/freshclam*
|
| |
%exclude %_mandir/man5/clamd.conf.5*
|
| |
- %_unitdir/clamonacc.service
|
| |
|
| |
|
| |
%files lib
|
| |
@@ -548,8 +537,6 @@
|
| |
%files filesystem
|
| |
%attr(-,%updateuser,%updateuser) %dir %homedir
|
| |
%dir %_sysconfdir/clamd.d
|
| |
- # Used by both clamd, clamdscan, and clamonacc
|
| |
- %config(noreplace) %_sysconfdir/clamd.d/scan.conf
|
| |
|
| |
|
| |
%files data
|
| |
@@ -582,8 +569,13 @@
|
| |
%_mandir/man5/clamd.conf.5*
|
| |
%_mandir/man8/clamd.8*
|
| |
%_sbindir/clamd
|
| |
+ %if %{with clamonacc}
|
| |
+ %_bindir/clamonacc
|
| |
+ %endif
|
| |
%_unitdir/clamd@.service
|
| |
+ %_unitdir/clamonacc.service
|
| |
|
| |
+ %config(noreplace) %_sysconfdir/clamd.d/scan.conf
|
| |
%ghost %scanstatedir/clamd.sock
|
| |
%if %{with tmpfiles}
|
| |
%_tmpfilesdir/clamd.scan.conf
|
| |
@@ -616,7 +608,7 @@
|
| |
- Enable prelude support (bz#1829726)
|
| |
|
| |
* Wed Apr 29 2020 Orion Poplawski <orion@nwra.com> - 0.102.2-7
|
| |
- - Move /etc/clamd.d/scan.conf to clamav-filesystem
|
| |
+ - Move bin/clamonacc to clamd
|
| |
- Add patch to build with EL7 libcurl - re-enable on-access scanning
|
| |
(bz#1820395)
|
| |
- Add clamonacc.service
|
| |
sergiomb
commented 3 years ago
and instead move bin/clamonacc to clamd
i'm deeply sorry I pushed commits to master when I wanted pushed the commits to my fork , now I can't revert it .
Here it is what I'd like propose .
Also commit https://src.fedoraproject.org/fork/sergiomb/rpms/clamav/c/fcb861f89c7f10d1af0e1612973528e575bad7cf wasn't meant to be pushed to master , anyway it is a solution for bug (#1820069)
Again my apologizes
Best regards,