Sandro Bonazzola has uploaded a new change for review.
Change subject: build: ovirt-hosted-engine-ha-0.1.0-0.1.beta
......................................................................
build: ovirt-hosted-engine-ha-0.1.0-0.1.beta
- added autotools and generated output to .gitignore
- bumped spec file revision fixing:
- added sanlock dependencies
- E: hardcoded-library-path in
/usr/lib/python2.7/site-packages/ovirt_hosted_engine_ha
- W: invalid-url Source0
- W: incoherent-version-in-changelog
- W: conffile-without-noreplace-flag
- W: non-conffile-in-etc
Change-Id: If8b379a9750fb63f466047681a1c95487e565401
Signed-off-by: Sandro Bonazzola <[email protected]>
---
M .gitignore
M configure.ac
M ovirt-hosted-engine-ha.spec.in
3 files changed, 19 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-hosted-engine-ha
refs/changes/05/19205/1
diff --git a/.gitignore b/.gitignore
index 2eb2b81..878a901 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
/ovirt_hosted_engine_ha/agent/constants.py
/ovirt_hosted_engine_ha/broker/config.log
/ovirt_hosted_engine_ha/broker/constants.py
+/sudoers/sudoers
/tmp.repos/
# Autotools
@@ -32,6 +33,12 @@
/ovirt_hosted_engine_ha/broker/submonitors/Makefile.in
/ovirt_hosted_engine_ha/lib/Makefile
/ovirt_hosted_engine_ha/lib/Makefile.in
+/initscripts/Makefile
+/initscripts/Makefile.in
+/initscripts/config.log
+/sudoers/Makefile
+/sudoers/Makefile.in
+/sudoers/config.log
# PyCharm, IntelliJ IDEA-specific files
*.iml
diff --git a/configure.ac b/configure.ac
index ed845c0..9c92634 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,8 +22,8 @@
define([VERSION_MINOR], [1])
define([VERSION_FIX], [0])
define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX)
-define([VERSION_RELEASE], [0.0])
-define([VERSION_SUFFIX], [master])
+define([VERSION_RELEASE], [0.1])
+define([VERSION_SUFFIX], [beta])
AC_INIT([ovirt-hosted-engine-ha],
VERSION_NUMBER[-]VERSION_RELEASE[.]VERSION_SUFFIX)
PACKAGE_RPM_VERSION="VERSION_NUMBER"
diff --git a/ovirt-hosted-engine-ha.spec.in b/ovirt-hosted-engine-ha.spec.in
index 0036d94..ce0de46 100644
--- a/ovirt-hosted-engine-ha.spec.in
+++ b/ovirt-hosted-engine-ha.spec.in
@@ -21,7 +21,7 @@
%global package_name @PACKAGE_NAME@
%global engine_ha_bindir @ENGINE_HA_BINDIR@
%global engine_ha_confdir @ENGINE_HA_CONFDIR@
-%global engine_ha_libdir @ENGINE_HA_LIBDIR@
+%global engine_ha_libdir %{python_sitelib}/ovirt_hosted_engine_ha
%global engine_ha_logdir @ENGINE_HA_LOGDIR@
%global engine_ha_rundir @ENGINE_HA_RUNDIR@
@@ -38,7 +38,7 @@
Release: @PACKAGE_RPM_RELEASE@%{?release_suffix}%{?dist}
License: LGPLv2+
URL: http://www.ovirt.org
-Source:
http://resources.ovirt.org/releases/stable/3.3/%{name}-%{package_version}.tar.gz
+Source:
http://resources.ovirt.org/releases/nightly/src/%{name}-%{package_version}.tar.gz
Group: Applications/System
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -47,6 +47,8 @@
# FIXME any additional dependencies?
Requires: python
Requires: python-daemon
+Requires: sanlock >= 2.8
+Requires: sanlock-python
Requires: vdsm
Requires: vdsm-cli
BuildRequires: python2-devel
@@ -101,8 +103,8 @@
%doc README
%dir %{engine_ha_confdir}
-%config %{engine_ha_confdir}/agent-log.conf
-%config %{engine_ha_confdir}/broker-log.conf
+%config(noreplace) %{engine_ha_confdir}/agent-log.conf
+%config(noreplace) %{engine_ha_confdir}/broker-log.conf
%dir %{engine_ha_bindir}
%{engine_ha_bindir}/ovirt-ha-agent
@@ -121,7 +123,7 @@
%{_initrddir}/ovirt-ha-broker
%endif
-%{_sysconfdir}/sudoers.d/60_ovirt-ha
+%config(noreplace) %{_sysconfdir}/sudoers.d/60_ovirt-ha
%defattr(-, %{vdsm_user}, %{vdsm_group}, -)
@@ -170,5 +172,8 @@
%changelog
+* Fri Sep 13 2013 Sandro Bonazzola <[email protected]> - 0.1.0-0.1.beta
+- 0.1.0-0.1.beta
+
* Fri May 31 2013 Greg Padgett <[email protected]> - 0.0.0-0.0.master
- Initial add.
--
To view, visit http://gerrit.ovirt.org/19205
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If8b379a9750fb63f466047681a1c95487e565401
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-hosted-engine-ha
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
