Yaniv Dary has uploaded a new change for review.

Change subject: packaging: keep install path when package name altered (#845024)
......................................................................

packaging: keep install path when package name altered (#845024)

https://bugzilla.redhat.com/show_bug.cgi?id=845024

Change-Id: I660ed747b058e307a1672a9dc23a4d0eb983946a
Signed-off-by: Yaniv Dary <[email protected]>
---
M Makefile
M packaging/ovirt-engine-dwh.spec.in
2 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/54/7254/1

diff --git a/Makefile b/Makefile
index f6e7d3b..822e193 100644
--- a/Makefile
+++ b/Makefile
@@ -145,7 +145,7 @@
        install -d $(DESTDIR)$(DATA_DIR)
        install -d $(DESTDIR)$(DATA_DIR)/etl
        install -d $(DESTDIR)$(DATA_DIR)/db-scripts
-       install -d $(DESTDIR)$(SYSCONF_DIR)/ovirt-engine/$(PACKAGE_NAME)
+       install -d $(DESTDIR)$(SYSCONF_DIR)/ovirt-engine/$(OVIRT_DWH_NAME)
        install -d $(DESTDIR)$(SYSCONF_DIR)/cron.hourly
        install -d $(DESTDIR)$(SYSCONF_DIR)/logrotate.d
 
@@ -156,8 +156,8 @@
        install -p -m 755 
data-warehouse/history_etl/history_service/etl-common-functions.sh 
$(DESTDIR)$(DATA_DIR)/etl
        cp -a  data-warehouse/history_etl/context_files/* 
$(DESTDIR)$(DATA_DIR)/etl
        cp -r -a  data-warehouse/historydbscripts_postgres/* 
$(DESTDIR)$(DATA_DIR)/db-scripts
-       install -p -m 660 
data-warehouse/history_etl/context_files/ovirt_engine_dwh/historyetl_3_1/contexts/Default.properties
 $(DESTDIR)$(SYSCONF_DIR)/ovirt-engine/$(PACKAGE_NAME)
-       install -p -m 644 packaging/resources/$(OVIRT_DWH_NAME)d.logrotate 
$(DESTDIR)$(SYSCONF_DIR)/logrotate.d/$(PACKAGE_NAME)d
+       install -p -m 660 
data-warehouse/history_etl/context_files/ovirt_engine_dwh/historyetl_3_1/contexts/Default.properties
 $(DESTDIR)$(SYSCONF_DIR)/ovirt-engine/$(OVIRT_DWH_NAME)
+       install -p -m 644 packaging/resources/$(OVIRT_DWH_NAME)d.logrotate 
$(DESTDIR)$(SYSCONF_DIR)/logrotate.d/$(OVIRT_DWH_NAME)d
        install -p -m 755 packaging/resources/ovirt_engine_dwh_watchdog.cron 
$(DESTDIR)$(SYSCONF_DIR)/cron.hourly
 
        install -d $(DESTDIR)$(BIN_DIR)
diff --git a/packaging/ovirt-engine-dwh.spec.in 
b/packaging/ovirt-engine-dwh.spec.in
index e33ee74..71c9da7 100644
--- a/packaging/ovirt-engine-dwh.spec.in
+++ b/packaging/ovirt-engine-dwh.spec.in
@@ -126,12 +126,12 @@
 %{_mavenpomdir}/JPP.%{name}-*
 %endif
 
-%dir %{_sysconfdir}/ovirt-engine/%{name}
+%dir %{_sysconfdir}/ovirt-engine/%{dwh_name}
 %{_initddir}/%{dwh_name}d
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}d
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{dwh_name}d
 %{_bindir}/%{dwh_name}-setup
 %{_sysconfdir}/cron.hourly/ovirt_engine_dwh_watchdog.cron
-%config(noreplace) %{_sysconfdir}/ovirt-engine/%{name}/Default.properties
+%config(noreplace) %{_sysconfdir}/ovirt-engine/%{dwh_name}/Default.properties
 
 %changelog
 * Thu Apr 19 2012 Yaniv Dary <[email protected]> - 3.0.0-1.fc16


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

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

Reply via email to