File clamav.spec.rej of Package clamav.openSUSE_13.2_Update

--- clamav.spec (revision 5)
+++ clamav.spec (revision 2)
@@ -202,22 +200,6 @@
 systemd-tmpfiles --create %_tmpfilesdir/clamav.conf
 %service_add_post clamd.service freshclam.service clamav-milter.service
 
-# merge config files on update
-test "0$1" -lt 2 && exit 0
-umask 022
-for f in /etc/clamd.conf /etc/freshclam.conf /etc/clamav-milter.conf; do
-  if test -e $f.rpmnew; then
-    echo "Merging $f and $f.rpmnew"
-    %_sbindir/updateclamconf -v override="$OVERRIDE" $f $f.rpmnew > $f.tmp
-    if test $? == 0; then
-      mv $f $f.old
-      mv $f.tmp $f
-    else
-      echo "Merging $f with $f.rpmnew failed"
-    fi
-  fi
-done
-
 %preun
 %service_del_preun clamd.service freshclam.service clamav-milter.service
 
openSUSE Build Service is sponsored by