diff --git a/.gitignore b/.gitignore index 8d59775..541e90c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /5.6.2.tar.gz /clamav-unofficial-sigs-6.1.1.tar.gz /clamav-unofficial-sigs-7.0.tar.gz +/clamav-unofficial-sigs-7.0.1.tar.gz diff --git a/clamav-unofficial-sigs.spec b/clamav-unofficial-sigs.spec index 7eb4eec..f9626ed 100644 --- a/clamav-unofficial-sigs.spec +++ b/clamav-unofficial-sigs.spec @@ -8,7 +8,7 @@ %global clamupdategrp clam-update %endif Name: clamav-unofficial-sigs -Version: 7.0 +Version: 7.0.1 Release: 1%{?dist} Summary: Scripts to download unofficial clamav signatures Group: Applications/System @@ -61,13 +61,6 @@ sed -i -e '/^#pkg_mgr/ s/^#//;s/""/"dnf"/' config/master.conf sed -i -e '/ExecStart=/ s|/usr/local/sbin|%{_sbindir}|' systemd/clamav-unofficial-sigs.service # Disable yara rules sed -i -e '/^enable_yararules/ s/yes/no/' config/master.conf -# Do not restart if service not running -sed -i -e '/^clamd_restart_opt/ s/systemctl restart/systemctl try-restart/' config/os/os.recommended-packaging-defaults.conf -# Do not check for new version also on CentOS 6 -%if 0%{?rhel} && 0%{?rhel} == 6 -echo 'allow_upgrades="no"' >> config/os/os.centos6.conf -echo 'allow_update_checks="no"' >> config/os/os.centos6.conf -%endif %install rm -rf %{buildroot} @@ -80,11 +73,11 @@ install -d -p %{buildroot}%{_sysconfdir}/cron.d install -d -p %{buildroot}%{_sysconfdir}/logrotate.d install -d -p %{buildroot}%{_mandir}/man8 install -p -m0755 clamav-unofficial-sigs.sh %{buildroot}%{_sbindir}/clamav-unofficial-sigs.sh -# config/os/os.recommended-packaging-defaults.conf file is for epel and fedora +# config/packaging/os.centos7.conf file is for epel and fedora %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 -install -p -m0644 config/os/os.recommended-packaging-defaults.conf %{buildroot}%{_sysconfdir}/%{name}/os.conf +install -p -m0644 config/packaging/os.centos7.conf %{buildroot}%{_sysconfdir}/%{name}/os.conf %else -install -p -m0644 config/os/os.centos6.conf %{buildroot}%{_sysconfdir}/%{name}/os.conf +install -p -m0644 config/packaging/os.centos6.conf %{buildroot}%{_sysconfdir}/%{name}/os.conf %endif install -p -m0644 config/user.conf %{buildroot}%{_sysconfdir}/%{name}/user.conf install -p -m0644 config/master.conf %{buildroot}%{_sysconfdir}/%{name}/master.conf @@ -116,6 +109,9 @@ rm -rf %{buildroot} %{_mandir}/man*/%{name}* %changelog +* Mon Jan 27 2020 Ján ONDREJ (SAL) - 7.0.1-1 +- Update to upstream, remove changes applied upstream + * Sat Jan 25 2020 Ján ONDREJ (SAL) - 7.0-1 - Update to upstream, fix version warnings (bz#1794506) diff --git a/sources b/sources index 8b3cd75..9a6c7b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clamav-unofficial-sigs-7.0.tar.gz) = 0bb617f7031ef0b0abdc7f4a5491c912989641be9c1acccbce87cb804f64d11a6180d9bd2f47b55817e1d418f7f01e6afe0f0517f2a0e5d27e4f7914c5d9413e +SHA512 (clamav-unofficial-sigs-7.0.1.tar.gz) = 2cba341bce50b03d17f46662b499a3378d4e5750f4abe837bbddee5c671636553660723243c4b90de96c84210926f6406f554b7936600c3ae618644af40bf802