Alex Lourie has uploaded a new change for review.

Change subject: packaging: spec: run setup, upgrade and cleanup as otopi
......................................................................

packaging: spec: run setup, upgrade and cleanup as otopi

Change-Id: Ibe5804c5dd876146ba1f5f48c9caa49d08c9f57a
Signed-off-by: Alex Lourie <[email protected]>
---
M Makefile
M ovirt-engine.spec.in
2 files changed, 3 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/17203/1

diff --git a/Makefile b/Makefile
index 0fef9b5..eeb4aeb 100644
--- a/Makefile
+++ b/Makefile
@@ -352,8 +352,9 @@
                $(NULL)
 
        install -d -m 755 "$(DESTDIR)$(BIN_DIR)"
-       ln -sf "$(DATA_DIR)/setup/bin/ovirt-engine-setup" 
"$(DESTDIR)$(BIN_DIR)/engine-setup-2"
-       ln -sf "$(DATA_DIR)/setup/bin/ovirt-engine-remove" 
"$(DESTDIR)$(BIN_DIR)/engine-cleanup-2"
+       ln -sf "$(DATA_DIR)/setup/bin/ovirt-engine-setup" 
"$(DESTDIR)$(BIN_DIR)/engine-setup"
+       ln -sf "$(DATA_DIR)/setup/bin/ovirt-engine-setup" 
"$(DESTDIR)$(BIN_DIR)/engine-upgrade"
+       ln -sf "$(DATA_DIR)/setup/bin/ovirt-engine-remove" 
"$(DESTDIR)$(BIN_DIR)/engine-cleanup"
        ln -sf "$(DATA_DIR)/bin/engine-config.sh" 
"$(DESTDIR)$(BIN_DIR)/engine-config"
        ln -sf "$(DATA_DIR)/bin/engine-manage-domains.sh" 
"$(DESTDIR)$(BIN_DIR)/engine-manage-domains"
 
@@ -403,11 +404,8 @@
 
        # Main programs and links:
        install -m 755 packaging/fedora/setup/engine-setup.py 
"$(DESTDIR)$(DATA_DIR)/scripts"
-       ln -sf "$(DATA_DIR)/scripts/engine-setup.py" 
"$(DESTDIR)$(BIN_DIR)/engine-setup"
        install -m 755 packaging/fedora/setup/engine-cleanup.py 
"$(DESTDIR)$(DATA_DIR)/scripts"
-       ln -sf "$(DATA_DIR)/scripts/engine-cleanup.py" 
"$(DESTDIR)$(BIN_DIR)/engine-cleanup"
        install -m 755 packaging/fedora/setup/engine-upgrade.py 
"$(DESTDIR)$(DATA_DIR)/scripts"
-       ln -sf "$(DATA_DIR)/scripts/engine-upgrade.py" 
"$(DESTDIR)$(BIN_DIR)/engine-upgrade"
        install -m 755 packaging/fedora/setup/engine-check-update 
"$(DESTDIR)$(BIN_DIR)"
 
        # Create a version file
diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in
index 02c6182..1b0298f 100644
--- a/ovirt-engine.spec.in
+++ b/ovirt-engine.spec.in
@@ -776,8 +776,6 @@
 
 # Links to the main programs:
 %{_bindir}/engine-setup
-%{_bindir}/engine-setup-2
-%{_bindir}/engine-cleanup-2
 %{_bindir}/engine-upgrade
 %{_bindir}/engine-check-update
 %{_bindir}/engine-cleanup


-- 
To view, visit http://gerrit.ovirt.org/17203
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe5804c5dd876146ba1f5f48c9caa49d08c9f57a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alex Lourie <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to