(file) Return to tog-pegasus.spec CVS log (file) (dir) Up to [Pegasus] / pegasus / rpm

Diff for /pegasus/rpm/tog-pegasus.spec between version 1.20.2.23 and 1.20.2.24

version 1.20.2.23, 2005/04/26 00:14:03 version 1.20.2.24, 2005/08/04 00:35:45
Line 32 
Line 32 
 # #
 # Package spec for PEGASUS 2.4 # Package spec for PEGASUS 2.4
 # #
   
   %{?!PEGASUS_BUILD_TEST_RPM:   %define PEGASUS_BUILD_TEST_RPM        0}
   # do "rpmbuild --define 'PEGASUS_BUILD_TEST_RPM 1'" to build test RPM .
   
 %define srcRelease 1 %define srcRelease 1
 Summary: OpenPegasus WBEM Services for Linux Summary: OpenPegasus WBEM Services for Linux
 Name: tog-pegasus Name: tog-pegasus
Line 63 
Line 67 
 Services for Linux release. It provides Linux C++ developers with the WBEM files required to Services for Linux release. It provides Linux C++ developers with the WBEM files required to
 build WBEM Clients and Providers. It also supports C provider developers via the CMPI interface. build WBEM Clients and Providers. It also supports C provider developers via the CMPI interface.
  
   %if %{PEGASUS_BUILD_TEST_RPM}
 %package test %package test
 Summary:      The OpenPegasus Tests Summary:      The OpenPegasus Tests
 Group:        Systems Management/Base Group:        Systems Management/Base
Line 71 
Line 76 
  
 %description test %description test
 The OpenPegasus WBEM tests for the OpenPegasus 2.4 Linux rpm. The OpenPegasus WBEM tests for the OpenPegasus 2.4 Linux rpm.
   %endif
  
 %prep %prep
 [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
Line 147 
Line 153 
           PEGASUS_INCLUDE_DIR=%PEGASUS_INCLUDE_DIR \           PEGASUS_INCLUDE_DIR=%PEGASUS_INCLUDE_DIR \
           PEGASUS_HTML_DIR=%PEGASUS_HTML_DIR           PEGASUS_HTML_DIR=%PEGASUS_HTML_DIR
  
   %if %{PEGASUS_BUILD_TEST_RPM}
 make --directory=$PEGASUS_ROOT -f Makefile.ReleaseTest stageTEST \ make --directory=$PEGASUS_ROOT -f Makefile.ReleaseTest stageTEST \
         PEGASUS_ENVVAR_FILE=$PEGASUS_ROOT/env_var_Linux.status         PEGASUS_ENVVAR_FILE=$PEGASUS_ROOT/env_var_Linux.status
   %endif
  
 %install %install
 %define PEGASUS_PROD_DIR       /opt/tog-pegasus %define PEGASUS_PROD_DIR       /opt/tog-pegasus
Line 180 
Line 188 
 %define PEGASUS_SSL_CERT_FILE      server.pem %define PEGASUS_SSL_CERT_FILE      server.pem
 %define PEGASUS_SSL_TRUSTSTORE     client.pem %define PEGASUS_SSL_TRUSTSTORE     client.pem
 %define PEGASUS_INSTALL_SCRIPT_DIR $PEGASUS_ROOT/installs/scripts %define PEGASUS_INSTALL_SCRIPT_DIR $PEGASUS_ROOT/installs/scripts
   
   %if %{PEGASUS_BUILD_TEST_RPM}
 %define PEGASUS_TEST_DIR  /opt/tog-pegasus/test %define PEGASUS_TEST_DIR  /opt/tog-pegasus/test
 %define PEGASUS_TEST_STAGING_DIR  $PEGASUS_HOME/stagingDir %define PEGASUS_TEST_STAGING_DIR  $PEGASUS_HOME/stagingDir
 %define PEGASUS_TEST_BIN_DIR  %PEGASUS_TEST_DIR/bin %define PEGASUS_TEST_BIN_DIR  %PEGASUS_TEST_DIR/bin
 %define PEGASUS_TEST_LIB_DIR  %PEGASUS_TEST_DIR/lib %define PEGASUS_TEST_LIB_DIR  %PEGASUS_TEST_DIR/lib
 %define PEGASUS_TEST_MAK_DIR  %PEGASUS_TEST_DIR/mak %define PEGASUS_TEST_MAK_DIR  %PEGASUS_TEST_DIR/mak
   %endif
  
 # #
 # Make directories # Make directories
Line 566 
Line 577 
 install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/Load/MethodProviderR.mof %SAMPLES_DEST_PATH/Providers/Load/MethodProviderR.mof install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/Load/MethodProviderR.mof %SAMPLES_DEST_PATH/Providers/Load/MethodProviderR.mof
 install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/Load/SampleProviderSchema.mof %SAMPLES_DEST_PATH/Providers/Load/SampleProviderSchema.mof install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/Load/SampleProviderSchema.mof %SAMPLES_DEST_PATH/Providers/Load/SampleProviderSchema.mof
 install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/Load/SimpleDisplayConsumerR.mof %SAMPLES_DEST_PATH/Providers/Load/SimpleDisplayConsumerR.mof install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/Load/SimpleDisplayConsumerR.mof %SAMPLES_DEST_PATH/Providers/Load/SimpleDisplayConsumerR.mof
   
   %if %{PEGASUS_BUILD_TEST_RPM}
 # #
 # Tests # Tests
 # #
Line 621 
Line 634 
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_LIB_DIR/libSampleInstanceProvider.so.1 $RPM_BUILD_ROOT%PEGASUS_TEST_LIB_DIR/libSampleInstanceProvider.so.1 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_LIB_DIR/libSampleInstanceProvider.so.1 $RPM_BUILD_ROOT%PEGASUS_TEST_LIB_DIR/libSampleInstanceProvider.so.1
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_LIB_DIR/libSampleMethodProvider.so.1   $RPM_BUILD_ROOT%PEGASUS_TEST_LIB_DIR/libSampleMethodProvider.so.1 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_LIB_DIR/libSampleMethodProvider.so.1   $RPM_BUILD_ROOT%PEGASUS_TEST_LIB_DIR/libSampleMethodProvider.so.1
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_MAK_DIR/commands.mak $RPM_BUILD_ROOT%PEGASUS_TEST_MAK_DIR/commands.mak install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_MAK_DIR/commands.mak $RPM_BUILD_ROOT%PEGASUS_TEST_MAK_DIR/commands.mak
   %endif
   
 cd $RPM_BUILD_ROOT cd $RPM_BUILD_ROOT
 rm -Rf $PEGASUS_HOME rm -Rf $PEGASUS_HOME
  
Line 732 
Line 747 
 echo " run /opt/tog-pegasus/sbin/settogpath."; echo " run /opt/tog-pegasus/sbin/settogpath.";
 fi fi
  
   %if %{PEGASUS_BUILD_TEST_RPM}
 %post test %post test
 /etc/init.d/tog-pegasus stop /etc/init.d/tog-pegasus stop
 cd %PEGASUS_VARDATA_DIR cd %PEGASUS_VARDATA_DIR
Line 741 
Line 757 
 cd %PEGASUS_TEST_DIR cd %PEGASUS_TEST_DIR
 make create_providerlinks make create_providerlinks
 make tests make tests
   %endif
  
 %preun %preun
 if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
Line 1057 
Line 1074 
 %attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/Load/SampleProviderSchema.mof %attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/Load/SampleProviderSchema.mof
 %attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/Load/SimpleDisplayConsumerR.mof %attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/Load/SimpleDisplayConsumerR.mof
  
   %if %{PEGASUS_BUILD_TEST_RPM}
 %files test %files test
 %attr(-,root,root) %PEGASUS_TEST_DIR/Makefile %attr(-,root,root) %PEGASUS_TEST_DIR/Makefile
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/CompAssoc %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/CompAssoc
Line 1102 
Line 1120 
 %attr(-,root,root) %PEGASUS_TEST_LIB_DIR/libSampleMethodProvider.so.1 %attr(-,root,root) %PEGASUS_TEST_LIB_DIR/libSampleMethodProvider.so.1
 %attr(-,root,root) %PEGASUS_TEST_MAK_DIR/commands.mak %attr(-,root,root) %PEGASUS_TEST_MAK_DIR/commands.mak
 %PEGASUS_TEST_REPOSITORY_DIR %PEGASUS_TEST_REPOSITORY_DIR
   %endif
  

Legend:
Removed from v.1.20.2.23  
changed lines
  Added in v.1.20.2.24
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2