Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: solve conflict with versionlocked 3.2 packages ......................................................................
packaging: solve conflict with versionlocked 3.2 packages setup is not version locked, so the move of these files to setup created a conflict in setup installation as the ovirt-engine package could not be updated at the same transaction. leave these files for now at base package. Change-Id: I82187ed1d661fa8bb1613ef336cb837deac80a9a Signed-off-by: Alon Bar-Lev <[email protected]> --- M ovirt-engine.spec.in 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/78/14678/1 diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index 6d04604..85631c6 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -542,6 +542,13 @@ %{_mavenpomdir}/JPP.%{name}-utils.pom %endif +# should be actually be +# at setup package, but as we use +# versionlock we cannot move these until +# 3.4 +%{engine_data}/conf/engine-config-install.properties +%{engine_data}/conf/ovirt-engine-proxy.conf.in + # Documentation: %doc LICENSE @@ -692,9 +699,7 @@ # Configuration files %{engine_data}/conf/iptables.default -%{engine_data}/conf/engine-config-install.properties %{engine_data}/conf/nfs.sysconfig -%{engine_data}/conf/ovirt-engine-proxy.conf.in %{engine_data}/conf/ovirt-engine-root-redirect.conf.in %{engine_data}/conf/version -- To view, visit http://gerrit.ovirt.org/14678 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82187ed1d661fa8bb1613ef336cb837deac80a9a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
