Hello community, here is the log from the commit of package clamav for openSUSE:Factory checked in at 2014-06-23 09:23:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clamav (Old) and /work/SRC/openSUSE:Factory/.clamav.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clamav" Changes: -------- --- /work/SRC/openSUSE:Factory/clamav/clamav.changes 2014-05-09 20:30:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.clamav.new/clamav.changes 2014-06-23 09:23:58.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jun 12 13:30:02 UTC 2014 - m...@suse.com + +- Fix dangling symlink in documentation (bnc#872682). +- Remove init scripts and complete systemd integration. +- Remove %ghost entry for /var/run/clamav. + +------------------------------------------------------------------- Old: ---- clamav-rcclamd clamav-rcfreshclam clamav-rcmilter ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clamav.spec ++++++ --- /var/tmp/diff_new_pack.XhY4gk/_old 2014-06-23 09:24:00.000000000 +0200 +++ /var/tmp/diff_new_pack.XhY4gk/_new 2014-06-23 09:24:00.000000000 +0200 @@ -56,15 +56,11 @@ Obsoletes: clamav-db < 0.88.3 PreReq: %_sbindir/groupadd %_sbindir/useradd %_sbindir/usermod PreReq: /usr/bin/awk /bin/sed /bin/tar -PreReq: %insserv_prereq Source0: http://downloads.sourceforge.net/clamav/%{name}-%{version}.tar.gz Source10: http://downloads.sourceforge.net/clamav/%{name}-%{version}.tar.gz.sig Source11: clamav.keyring -Source1: clamav-rcclamd -Source2: clamav-rcfreshclam Source3: clamav-updateclamconf Source4: clamav-rpmlintrc -Source5: clamav-rcmilter Source6: clamav-tmpfiles.conf Source7: service.clamd Source8: service.freshclam @@ -73,9 +69,8 @@ Patch2: clamav-sles9.patch Patch3: clamav-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} >= 1210 BuildRequires: systemd -%endif +%systemd_requires %description ClamAV is an open source (GPL) antivirus engine designed for detecting @@ -134,16 +129,7 @@ %install %makeinstall -ln -sf docs/html/{clamdoc,index}.html -mkdir -p %buildroot/etc/init.d -install -m755 %SOURCE1 %buildroot/etc/init.d/clamd -ln -s /etc/init.d/clamd %buildroot%_sbindir/rcclamd -install -m755 %SOURCE2 %buildroot/etc/init.d/freshclam -ln -s /etc/init.d/freshclam %buildroot%_sbindir/rcfreshclam -install -m755 %SOURCE5 %buildroot/etc/init.d/clamav-milter -ln -s /etc/init.d/clamav-milter %buildroot%_sbindir/rcclamav-milter -install -m755 %SOURCE3 %buildroot%_sbindir/updateclamconf -install -d -m755 %buildroot/var/{lib,run}/clamav +install -d -m755 %buildroot/var/lib/clamav install -d -m755 %buildroot/%_tmpfilesdir install -m644 %SOURCE6 %buildroot%_tmpfilesdir/clamav.conf mkdir -p %buildroot/var/spool/amavis @@ -170,7 +156,7 @@ # use it at all on systems without mandatory systemd %if 0%{?suse_version} >= 1230 for srvname in clamd freshclam clamav-milter;do - (export PATH=/sbin:/usr/sbin:$PATH ;ln -sf $(which service) %{buildroot}/%{_sbindir}/rc${srvname}) + (export PATH=/usr/sbin:/sbin:$PATH ;ln -sf $(which service) %{buildroot}/%{_sbindir}/rc${srvname}) done %endif %endif @@ -185,7 +171,6 @@ %files %defattr(-,root,root,-) %config(noreplace) %_sysconfdir/*.conf -%config %attr(744,root,root)/etc/init.d/* #systemd... %if 0%{?suse_version} >= 1210 %{_unitdir}/clamd.service @@ -204,17 +189,12 @@ %defattr(-,vscan,vscan) %dir %attr(750,vscan,vscan) /var/spool/amavis %dir /var/lib/clamav -%ghost %dir %attr(755,vscan,vscan) /var/run/clamav %pre %_sbindir/groupadd -r vscan 2> /dev/null || : %_sbindir/useradd -r -o -g vscan -u 65 -s /bin/false -c "Vscan account" -d /var/spool/amavis vscan 2> /dev/null || : %_sbindir/usermod vscan -g vscan 2> /dev/null || : -%post -%{fillup_and_insserv clamd} -%{fillup_and_insserv freshclam} -#%%{fillup_and_insserv clamav-filter} /sbin/ldconfig # merge config files on update test "0$1" -lt 2 && exit 0 @@ -231,16 +211,17 @@ fi fi done -%if 0%{?suse_version} >= 1210 systemd-tmpfiles --create %_tmpfilesdir/clamav.conf -%endif +%service_add_pre clamd.service freshclam.service clamav-milter.service + +%post +%service_add_post clamd.service freshclam.service clamav-milter.service %preun -%stop_on_removal clamd freshclam clamav-milter +%service_del_preun clamd.service freshclam.service clamav-milter.service %postun /sbin/ldconfig -%restart_on_update clamd freshclam clamav-milter -%insserv_cleanup +%service_del_postun clamd.service freshclam.service clamav-milter.service %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
