(file) Return to RPMMakefile CVS log (file) (dir) Up to [Pegasus] / pegasus / rpm

Diff for /pegasus/rpm/RPMMakefile between version 1.10 and 1.11

version 1.10, 2008/11/19 22:05:19 version 1.11, 2008/11/25 22:03:45
Line 163 
Line 163 
                 exit 1; fi                 exit 1; fi
 endef endef
  
   define removeRPM
           @if [ -n "`rpm -qa | grep $1-[0-9]`" ]; then \
              rpm -e `rpm -qa | grep $1-[0-9]`; \
           fi
   endef
   
 define startCIMServer define startCIMServer
         @/etc/init.d/tog-pegasus status > /dev/null 2>&1; \         @/etc/init.d/tog-pegasus status > /dev/null 2>&1; \
         if [ $$? != 0 ]; then \         if [ $$? != 0 ]; then \
Line 258 
Line 264 
         $(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts         $(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts
  
 cleanRPM: cleanRPM:
         -$(RPM) -e $(filter tog-pegasus-test%,$(TOG_INSTALLED_RPMS))          $(call removeRPM,tog-pegasus-test);
         -$(call startCIMServer)         -$(call startCIMServer)
         -$(RPM) -e $(filter tog-pegasus-devel%,$(TOG_INSTALLED_RPMS))          $(call removeRPM,tog-pegasus-devel);
         -$(RPM) -e $(filter tog-pegasus-2%,$(TOG_INSTALLED_RPMS))          $(call removeRPM,tog-pegasus);
         -$(RM) -Rf $(RPM_SRC_DIR).old         -$(RM) -Rf $(RPM_SRC_DIR).old
 ifneq ($(wildcard $(RPM_SRC_DIR)), ) ifneq ($(wildcard $(RPM_SRC_DIR)), )
         $(MV) $(RPM_SRC_DIR) $(RPM_SRC_DIR).old         $(MV) $(RPM_SRC_DIR) $(RPM_SRC_DIR).old


Legend:
Removed from v.1.10  
changed lines
  Added in v.1.11

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2