Sandro Bonazzola has uploaded a new change for review. Change subject: sos: requring sos >= 3.1 also on F19 ......................................................................
sos: requring sos >= 3.1 also on F19 sos 3 has been backported to F19 causing log-collector conflicts as previously on F20. Change-Id: I6108d9e56614e14ee8ae6c5044ad495c61456348 Bug-Url: https://bugzilla.redhat.com/1037663 Signed-off-by: Sandro Bonazzola <sbona...@redhat.com> --- M ovirt-log-collector.spec.in 1 file changed, 10 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-log-collector refs/changes/38/27438/1 diff --git a/ovirt-log-collector.spec.in b/ovirt-log-collector.spec.in index 59c31f9..3f6c489 100644 --- a/ovirt-log-collector.spec.in +++ b/ovirt-log-collector.spec.in @@ -36,7 +36,7 @@ Requires: logrotate Requires: openssh-clients -%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7 +%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 Requires: sos >= 3.1 %else Requires: sos < 3 @@ -44,7 +44,14 @@ BuildRequires: python2-devel BuildRequires: gettext -BuildRequires: sos + +%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 +BuildRequires: sos >= 3.1 +%else +BuildRequires: sos < 3 +%endif + + %description Log Collector tool for oVirt Engine @@ -72,7 +79,7 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/%{package_name} %{python_sitelib}/ovirt_log_collector/ %if 0%{?fedora} -%if 0%{?fedora} < 20 +%if 0%{?fedora} < 19 %{python_sitelib}/sos/plugins/*.py* %endif %endif -- To view, visit http://gerrit.ovirt.org/27438 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6108d9e56614e14ee8ae6c5044ad495c61456348 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-log-collector Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
