Sandro Bonazzola has uploaded a new change for review. Change subject: build: ovirt-log-collector-3.5.1 ......................................................................
build: ovirt-log-collector-3.5.1 Change-Id: Ieba64b11f61e19273213a76fd15afde4ce3b233a Signed-off-by: Sandro Bonazzola <[email protected]> --- M configure.ac M ovirt-log-collector.spec.in 2 files changed, 9 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-log-collector refs/changes/84/37084/1 diff --git a/configure.ac b/configure.ac index 8d10de7..e38a3cf 100644 --- a/configure.ac +++ b/configure.ac @@ -21,11 +21,11 @@ define([VERSION_MINOR], [5]) define([VERSION_FIX], [1]) define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX) -define([VERSION_SUFFIX], [_master]) +define([VERSION_SUFFIX], []) AC_INIT([ovirt-log-collector], VERSION_NUMBER[]VERSION_SUFFIX) PACKAGE_RPM_VERSION="VERSION_NUMBER" -PACKAGE_RPM_RELEASE="0.0.$(echo VERSION_SUFFIX | sed 's/^_//')" +PACKAGE_RPM_RELEASE="1" AC_SUBST([PACKAGE_RPM_VERSION]) AC_SUBST([PACKAGE_RPM_RELEASE]) diff --git a/ovirt-log-collector.spec.in b/ovirt-log-collector.spec.in index 31efa67..5bbfa15 100644 --- a/ovirt-log-collector.spec.in +++ b/ovirt-log-collector.spec.in @@ -24,19 +24,19 @@ Release: @PACKAGE_RPM_RELEASE@%{?release_suffix}%{?dist} License: ASL 2.0 URL: http://www.ovirt.org -Source: http://resources.ovirt.org/pub/ovirt-3.5-snapshot/src/%{package_name}/%{package_name}-%{package_version}.tar.gz +Source: http://resources.ovirt.org/pub/ovirt-3.5/src/%{package_name}/%{package_name}-%{package_version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: python Requires: python-dateutil Requires: python-lxml -Requires: ovirt-engine-sdk-python >= 3.5.0.7 +Requires: ovirt-engine-sdk-python >= 3.5.1.0 Requires: ovirt-engine-lib Requires: logrotate Requires: openssh-clients -%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 +%if 0%{?fedora} || 0%{?rhel} >= 7 Requires: sos >= 3.1-1.1 %else Requires: sos < 3 @@ -45,7 +45,7 @@ BuildRequires: python2-devel BuildRequires: gettext -%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 +%if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: sos >= 3 %else BuildRequires: sos < 3 @@ -78,11 +78,6 @@ %config(noreplace) %{_sysconfdir}/ovirt-engine/logcollector.conf %config(noreplace) %{_sysconfdir}/logrotate.d/%{package_name} %{python_sitelib}/ovirt_log_collector/ -%if 0%{?fedora} -%if 0%{?fedora} < 19 -%{python_sitelib}/sos/plugins/*.py* -%endif -%endif %if 0%{?rhel} %if 0%{?rhel} < 7 @@ -95,6 +90,9 @@ %{_mandir}/man8/* %changelog +* Mon Jan 19 2015 Sandro Bonazzola <[email protected]> - 3.5.1-1 +- 3.5.1-1 + * Fri Sep 19 2014 Sandro Bonazzola <[email protected]> - 3.5.1-0.0.master - 3.5.1-0.0.master -- To view, visit http://gerrit.ovirt.org/37084 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieba64b11f61e19273213a76fd15afde4ce3b233a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-log-collector Gerrit-Branch: ovirt-log-collector-3.5 Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
