BUG#: 8104

TITLE: File listed twice warning when building Test RPM

DESCRIPTION: Remove duplicate references to the files in the spec file.

diff --git a/Makefile.ReleaseTest b/Makefile.ReleaseTest
index a6fcf521baef9cbf596c6fc599f45ba96c3827f3..a3ea0e10f49782854bf5bc390567e297ce6359dc 100644 (file)
--- a/Makefile.ReleaseTest
+++ b/Makefile.ReleaseTest
@@ -174,6 +174,7 @@ stage_testemptyfiles:
        $(TOUCH) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/tmp/procIdFile
        $(TOUCH) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/tmp/trapLogFile
        $(TOUCH) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/tmp/IndicationStressTestLog
+       $(TOUCH) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/tmp/oldIndicationStressTestLog
 
 create_Makefile:
        @$(RM) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
@@ -334,13 +335,32 @@ _append_filesSectionToSpecFile:
        @$(ECHO-E) "%if %{PEGASUS_BUILD_TEST_RPM}" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "%files test"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "%defattr(-,$(INSTALL_USR),$(INSTALL_GRP),-)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
-       @$(ECHO-E) "$(PEGASUS_TEST_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+       @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+       @$(ECHO-E) "%dir $(PEGASUS_TEST_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+       @$(ECHO-E) "%dir $(PEGASUS_TEST_DIR)/bin" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+       @$(ECHO-E) "%dir $(PEGASUS_TEST_DIR)/\045PEGASUS_ARCH_LIB" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+       @$(ECHO-E) "%dir $(PEGASUS_TEST_DIR)/mak" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+       @$(ECHO-E) "%dir $(PEGASUS_TEST_DIR)/tmp" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+       @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "%ghost $(PEGASUS_TEST_DIR)/tmp/procIdFile" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "%ghost $(PEGASUS_TEST_DIR)/tmp/trapLogFile" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "%ghost $(PEGASUS_TEST_DIR)/tmp/IndicationStressTestLog" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+       @$(ECHO-E) "%ghost $(PEGASUS_TEST_DIR)/tmp/oldIndicationStressTestLog" \
+            >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+       @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+       @$(ECHO-E) "%attr($(Prwxr__r__),$(INSTALL_USR),$(INSTALL_GRP))" \
+            "$(PEGASUS_TEST_DIR)/bin/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+       @$(ECHO-E) "%attr($(Prwxr__r__),$(INSTALL_USR),$(INSTALL_GRP))" \
+            "$(PEGASUS_TEST_DIR)/\045PEGASUS_ARCH_LIB/*" \
+            >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+       @$(ECHO-E) "%attr($(Prwxr__r__),$(INSTALL_USR),$(INSTALL_GRP))" \
+            "$(PEGASUS_TEST_DIR)/mak/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+       @$(ECHO-E) "%attr($(Prw_r__r__),$(INSTALL_USR),$(INSTALL_GRP))" \
+            "$(PEGASUS_TEST_DIR)/Makefile" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+       @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "%defattr($(Prw_______),$(CIMSERVERMAIN_USR)," \
             "$(CIMSERVERMAIN_GRP),$(Prwx______))" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)

diff --git a/rpm/tog-pegasus.spec b/rpm/tog-pegasus.spec
index 380b8b53d278cb250f34ba0eade224afbf50c428..191f39ff604eaf60acbb2f5a629dbe16752dd587 100644 (file)
--- a/rpm/tog-pegasus.spec
+++ b/rpm/tog-pegasus.spec
@@ -512,10 +512,23 @@ fi
 %if %{PEGASUS_BUILD_TEST_RPM}
 %files test
 %defattr(-,root,pegasus,-)
-/usr/share/Pegasus/test
+
+%dir /usr/share/Pegasus/test
+%dir /usr/share/Pegasus/test/bin
+%dir /usr/share/Pegasus/test/%PEGASUS_ARCH_LIB
+%dir /usr/share/Pegasus/test/mak
+%dir /usr/share/Pegasus/test/tmp
+
 %ghost /usr/share/Pegasus/test/tmp/procIdFile
 %ghost /usr/share/Pegasus/test/tmp/trapLogFile
 %ghost /usr/share/Pegasus/test/tmp/IndicationStressTestLog
+%ghost /usr/share/Pegasus/test/tmp/oldIndicationStressTestLog
+
+%attr(744,root,pegasus) /usr/share/Pegasus/test/bin/*
+%attr(744,root,pegasus) /usr/share/Pegasus/test/%PEGASUS_ARCH_LIB/*
+%attr(744,root,pegasus) /usr/share/Pegasus/test/mak/*
+%attr(644,root,pegasus) /usr/share/Pegasus/test/Makefile
+
 %defattr(600,cimsrvr, cimsrvr,700)
 /var/lib/Pegasus/testrepository
 %endif