--- rpms/clamav/sme9/clamav.spec 2013/06/05 05:31:32 1.2 +++ rpms/clamav/sme9/clamav.spec 2014/02/01 00:29:29 1.6 @@ -13,8 +13,8 @@ Summary: Anti-virus software Name: clamav -Version: 0.97.8 -Release: 1%{?dist} +Version: 0.98.1 +Release: 3%{?dist} License: GPL Group: Applications/System URL: http://www.clamav.net/ @@ -122,7 +122,7 @@ you will need to install %{name}-devel. s|^\@INSTALL_FRESHCLAM_CONF_TRUE\@|\t|g; ' database/Makefile.in etc/Makefile.in -%{__perl} -pi.orig -e ' +%{__perl} -pi -e ' s|^(Example)|#$1|; s|^#(LogFile) .+$|$1 %{_localstatedir}/log/clamav/clamd.log|; s|^#(LogFileMaxSize) .*|$1 0|; @@ -150,9 +150,9 @@ you will need to install %{name}-devel. s|^#(ArchiveMaxCompressionRatio) .+|$1 300|; s|^#(ArchiveBlockEncrypted)|$1|; s|^#(ArchiveBlockMax)|$1|; - ' etc/clamd.conf + ' etc/clamd.conf.sample >etc/clamd.conf -%{__perl} -pi.orig -e ' +%{__perl} -pi -e ' s|^(Example)|#$1|; s|^#(AllowSupplementaryGroups) .+$|$1 yes|; s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; @@ -162,9 +162,9 @@ you will need to install %{name}-devel. s|^#(LogTime)|$1|; s|^#(MilterSocket) /.*$|$1 unix:%{_localstatedir}/clamav/clmilter.socket|; s|^#(User) .+$|$1 clamav|; - ' etc/clamav-milter.conf + ' etc/clamav-milter.conf.sample >etc/clamav-milter.conf -%{__perl} -pi.orig -e ' +%{__perl} -p -e ' s|^(Checks) .+$|$1 24|; s|^(Example)|#$1|; s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/clamav|; @@ -172,7 +172,7 @@ you will need to install %{name}-devel. s|^#(LogSyslog)|$1|; s|^#(NotifyClamd) .+$|$1 %{_sysconfdir}/clamd.conf|; s|^#(UpdateLogFile) .+$|$1 %{_localstatedir}/log/clamav/freshclam.log|; - ' etc/freshclam.conf + ' etc/freshclam.conf.sample >etc/freshclam.conf %{__cat} <clamd.logrotate %{_localstatedir}/log/clamav/clamd.log { @@ -234,11 +234,14 @@ EOF %{__make} install DESTDIR="%{buildroot}" %{__install} -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd +%{__install} -Dp -m0644 etc/freshclam.conf %{buildroot}%{_sysconfdir}/freshclam.conf %{__install} -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam %{__install} -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam +%{__install} -Dp -m0644 etc/clamd.conf %{buildroot}%{_sysconfdir}/clamd.conf %{__install} -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav %if %{!?_without_milter:1}0 +%{__install} -Dp -m0644 etc/clamav-milter.conf %{buildroot}%{_sysconfdir}/clamav-milter.conf %{__install} -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter %{__install} -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter %else @@ -318,7 +321,8 @@ fi %files %defattr(-, root, root, 0755) %doc AUTHORS BUGS ChangeLog COPYING FAQ INSTALL NEWS README -%doc docs/*.pdf etc/freshclam.conf +%doc etc/freshclam.conf.sample +%doc docs/*.pdf ### Remove test virus documents as they trigger clamav #%doc test/ %doc %{_mandir}/man1/sigtool.1* @@ -338,10 +342,11 @@ fi %{_libdir}/libclamav.so %{_libdir}/libclamunrar.so %{_libdir}/libclamunrar_iface.so +%exclude %{_sysconfdir}/freshclam.conf.sample %files -n clamd %defattr(-, root, root, 0755) -%doc etc/clamd.conf +%doc etc/clamd.conf.sample %doc %{_mandir}/man1/clambc.1* %doc %{_mandir}/man1/clamconf.1* %doc %{_mandir}/man1/clamdscan.1* @@ -361,11 +366,14 @@ fi %dir %{_localstatedir}/clamav/ %dir %{_localstatedir}/log/clamav/ %ghost %{_localstatedir}/log/clamav/clamd.log + %exclude %{_localstatedir}/clamav/* +%exclude %{_sysconfdir}/clamd.conf.sample %if %{!?_without_milter:1}0 %files milter %defattr(-, root, root, 0755) +%doc etc/clamav-milter.conf.sample %doc %{_mandir}/man5/clamav-milter.conf.5* %doc %{_mandir}/man8/clamav-milter.8* %config(noreplace) %{_sysconfdir}/clamav-milter.conf @@ -375,6 +383,7 @@ fi %else %exclude %{_mandir}/man5/clamav-milter.conf.5* %endif +%exclude %{_sysconfdir}/clamav-milter.conf.sample %files db %defattr(-, root, root, 0755) @@ -396,7 +405,19 @@ fi %exclude %{_libdir}/libclamunrar_iface.la %changelog -* Sat May 4 2013 David Beveridge - 0.97.8-1 +* Fri Jan 31 2014 Ian Wells - 0.98.1-3.sme +- Revert last change. [SME: 8163] + +* Fri Jan 31 2014 Ian Wells - 0.98.1-2.sme +- Sources are local, do not download them. [SME: 8163] + +* Sun Jan 26 2014 David Beveridge - 0.98.1-1.sme +- Updates to release 0.98.1 [SME: 8163] + +* Tue Sep 24 2013 Dag Wieers - 0.98-1 +- Updated to release 0.98. + +* Tue May 07 2013 David Hrbá? - 0.97.8-1 - Updated to release 0.97.8. * Wed Mar 20 2013 Dag Wieers - 0.97.7-1 @@ -405,10 +426,10 @@ fi * Sun Sep 23 2012 Dag Wieers - 0.97.6-1 - Updated to release 0.97.6. -* Mon Jun 25 2012 David Hrbáč - 0.97.5-2 +* Mon Jun 25 2012 David Hrbá? - 0.97.5-2 - removed missing *.cld files (#183) -* Thu Jun 21 2012 David Hrbáč - 0.97.5-1 +* Thu Jun 21 2012 David Hrbá? - 0.97.5-1 - corrected missing DBs - new upstream release @@ -439,7 +460,7 @@ fi * Mon Oct 25 2010 Dag Wieers - 0.96.4-1 - Updated to release 0.96.4. -* Tue Sep 21 2010 David Hrbáč - 0.96.3-2 +* Tue Sep 21 2010 David Hrbá? - 0.96.3-2 - Added buildrequires check-devel. * Tue Sep 21 2010 Dag Wieers - 0.96.3-1