commit clamav for openSUSE:Factory
Hello community, here is the log from the commit of package clamav for openSUSE:Factory checked in at 2015-01-30 20:31:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-01-03 22:01:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.clamav.new/clamav.changes 2015-01-30 20:31:52.000000000 +0100 @@ -1,0 +2,16 @@ +Fri Jan 30 15:19:34 UTC 2015 - max@suse.com + +- Don't need sendmail for building clamav-milter anymore, + sendmail-devel is enough (bnc#915414). + +------------------------------------------------------------------- +Fri Jan 23 14:03:18 UTC 2015 - max@suse.com + +- bnc#914505: Config file merging and temp file creation got moved + to %pre by mistake. Put them back to %post. +- Restore the updateclamconf script (bnc#908731). +- Fix a step backwards in the soname version from 0.98.4 to 0.98.5 + (https://bugzilla.clamav.net/show_bug.cgi?id=11193, + clamav-soname.patch). + +------------------------------------------------------------------- New: ---- clamav-soname.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clamav.spec ++++++ --- /var/tmp/diff_new_pack.30oXX1/_old 2015-01-30 20:31:53.000000000 +0100 +++ /var/tmp/diff_new_pack.30oXX1/_new 2015-01-30 20:31:53.000000000 +0100 @@ -21,7 +21,6 @@ Name: clamav BuildRequires: ncurses-devel BuildRequires: sed -BuildRequires: sendmail BuildRequires: sendmail-devel %define llvm --disable-llvm %if 0%{?suse_version} >= 1010 @@ -68,6 +67,7 @@ Patch1: clamav-conf.patch Patch2: clamav-sles9.patch Patch3: clamav-gcc47.patch +Patch4: clamav-soname.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: systemd %systemd_requires @@ -90,6 +90,7 @@ %patch2 %endif %patch3 -p1 +%patch4 -p1 %build %if 0%{?suse_version} >= 1010 @@ -130,6 +131,7 @@ %install %makeinstall +install -m755 %SOURCE3 %buildroot%_sbindir/updateclamconf install -d -m755 %buildroot/var/lib/clamav install -d -m755 %buildroot/%_tmpfilesdir install -m644 %SOURCE6 %buildroot%_tmpfilesdir/clamav.conf @@ -195,8 +197,13 @@ %_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 || : +%service_add_pre clamd.service freshclam.service clamav-milter.service +%post /sbin/ldconfig +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 @@ -212,11 +219,6 @@ fi fi done -systemd-tmpfiles --create %_tmpfilesdir/clamav.conf -%service_add_pre clamd.service freshclam.service clamav-milter.service - -%post -%service_add_post clamd.service freshclam.service clamav-milter.service %preun %service_del_preun clamd.service freshclam.service clamav-milter.service ++++++ clamav-soname.patch ++++++ diff --git a/configure b/configure index 95168bb..c31f831 100755 --- a/configure +++ b/configure @@ -5090,7 +5090,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } VERSION="0.98.5" LC_CURRENT=7 -LC_REVISION=22 +LC_REVISION=24 LC_AGE=1 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE" diff --git a/m4/reorganization/version.m4 b/m4/reorganization/version.m4 index ea263b2..f4fe8b1 100644 --- a/m4/reorganization/version.m4 +++ b/m4/reorganization/version.m4 @@ -3,7 +3,7 @@ dnl VERSION="devel-`date +%Y%m%d`" VERSION="0.98.5" LC_CURRENT=7 -LC_REVISION=22 +LC_REVISION=24 LC_AGE=1 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE" AC_SUBST([LIBCLAMAV_VERSION]) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de