Ofer Schreiber has uploaded a new change for review. Change subject: packaging: Set otopi based setup utilities as defult ......................................................................
packaging: Set otopi based setup utilities as defult Set the defult engine-setup/cleanup/upgrade to be the otopi based scripts, instead of legacy Change-Id: I3e6f3c0ad938ece35ae2144e21fbd60775a1e910 Signed-off-by: Ofer Schreiber <[email protected]> --- M Makefile M ovirt-engine.spec.in 2 files changed, 3 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/60/17260/1 diff --git a/Makefile b/Makefile index 182a031..14833f7 100644 --- a/Makefile +++ b/Makefile @@ -357,8 +357,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" @@ -408,12 +409,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 echo "$(DISPLAY_VERSION)" > "$(DESTDIR)$(DATA_DIR)/conf/version" diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index 7eb279b..c949966 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -784,10 +784,7 @@ # 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 # Python scripts: @@ -822,8 +819,6 @@ %ghost %config(noreplace) %{_sysconfdir}/firewalld/services/ovirt.xml # Man pages -%{_mandir}/man8/engine-setup.* -%{_mandir}/man8/engine-upgrade.* %{_mandir}/man8/engine-config.* # Configuration files -- To view, visit http://gerrit.ovirt.org/17260 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3e6f3c0ad938ece35ae2144e21fbd60775a1e910 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ofer Schreiber <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
