summaryrefslogtreecommitdiffstats
path: root/Makefile.Release
diff options
context:
space:
mode:
authordenise.eckstein <denise.eckstein>2008-03-05 21:56:26 +0000
committerdenise.eckstein <denise.eckstein>2008-03-05 21:56:26 +0000
commitc2f78f47fe0944de585cbef9fc7c8636ff9b622a (patch)
tree993a1961dbf214a8cacb4359ede2c5ae7084c314 /Makefile.Release
parent1283f36c9c2ab5ca6ab17cc05342df215c3e341a (diff)
downloadtog-pegasus-c2f78f47fe0944de585cbef9fc7c8636ff9b622a.zip
tog-pegasus-c2f78f47fe0944de585cbef9fc7c8636ff9b622a.tar.gz
tog-pegasus-c2f78f47fe0944de585cbef9fc7c8636ff9b622a.tar.xz
BUG#: 7004
TITLE: cimserver_planned.conf is installed with the wrong group DESCRIPTION: Modified tog-pegasus.spec file to change group for cimserver_planned.conf file.
Diffstat (limited to 'Makefile.Release')
-rw-r--r--Makefile.Release10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.Release b/Makefile.Release
index 3b4a25e..99c607d 100644
--- a/Makefile.Release
+++ b/Makefile.Release
@@ -370,7 +370,7 @@ stage_PegasusVarDataDirectoryFiles: FORCE
$(COPY) $(ROOT)/src/Server/cimserver_planned.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
setpermissions_PegasusVarDataDirectoryFiles: FORCE
- $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prw_r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
+ $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prw_r__r__)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
stage_genOpenPegasusSSLCertsFile: FORCE
@$(RM) $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts
@@ -1019,8 +1019,8 @@ _append_filesSectionToSpecFile: FORCE
@$(ECHO-E) "%dir $(PEGASUS_PROVIDER_LIB_DIR_2) " \
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
- @$(ECHO-E) "%dir %attr($(Prwxr_xr_x), $(CIMSERVER_USR)," \
- "$(CIMSERVER_GRP)) $(PEGASUS_CONFIG_DIR)" \
+ @$(ECHO-E) "%dir %attr($(Prwxr_xr_x), $(INSTALL_USR)," \
+ "$(INSTALL_GRP)) $(PEGASUS_CONFIG_DIR)" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%dir %attr($(Prwxr_xr_x), $(CIMSERVERMAIN_USR)," \
"$(CIMSERVERMAIN_GRP)) $(PEGASUS_VARRUN_DIR)" \
@@ -1036,8 +1036,8 @@ _append_filesSectionToSpecFile: FORCE
@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%config %attr($(Prwxr_x___),$(INSTALL_USR),$(INSTALL_GRP))"\
"/etc/init.d/tog-pegasus" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
- @$(ECHO-E) "%config(noreplace) %attr($(Prw_r__r__), " \
- "$(CIMSERVER_USR), $(CIMSERVER_GRP))" \
+ @$(ECHO-E) "%config(noreplace)" \
+ "%attr($(Prw_r__r__),$(CIMSERVER_USR),$(CIMSERVER_GRP))" \
"$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%config(noreplace) $(PEGASUS_CONFIG_DIR)/access.conf" \