(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.29 and 1.25

version 1.20.2.29, 2005/11/10 01:51:27 version 1.25, 2005/02/18 23:17:36
Line 1 
Line 1 
 #%2005////////////////////////////////////////////////////////////////////////  #%2003////////////////////////////////////////////////////////////////////////
 # #
 # Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development # Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 # Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. # Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
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
 Version: 2.4.2  Version: 2.4RC1
 Release: 1%{?LINUX_VERSION:.%{LINUX_VERSION}}  Release: 1
 Group: Systems Management/Base Group: Systems Management/Base
 Copyright: Open Group Pegasus Open Source Copyright: Open Group Pegasus Open Source
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
Line 56 
Line 52 
 communication protocol for monitoring and controlling resources from diverse communication protocol for monitoring and controlling resources from diverse
 sources. sources.
  
 %package devel  %package sdk
 Summary:      The OpenPegasus Software Development Kit Summary:      The OpenPegasus Software Development Kit
 Group:        Systems Management/Base Group:        Systems Management/Base
 Autoreq: 0 Autoreq: 0
 Requires: tog-pegasus >= 2.4 Requires: tog-pegasus >= 2.4
 Obsoletes: tog-pegasus-sdk  
  
 %description devel  %description sdk
 The OpenPegasus WBEM Services for Linux SDK is the developer's kit for the OpenPegasus WBEM The OpenPegasus WBEM Services for Linux SDK is the developer's kit for the OpenPegasus WBEM
 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  
 Summary:      The OpenPegasus Tests  
 Group:        Systems Management/Base  
 Autoreq: 0  
 Requires: tog-pegasus >= 2.4  
   
 %description test  
 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 91 
Line 75 
 %build %build
 export PEGASUS_EXTRA_C_FLAGS="-g $RPM_OPT_FLAGS" export PEGASUS_EXTRA_C_FLAGS="-g $RPM_OPT_FLAGS"
 export PEGASUS_EXTRA_CXX_FLAGS="$PEGASUS_EXTRA_C_FLAGS" export PEGASUS_EXTRA_CXX_FLAGS="$PEGASUS_EXTRA_C_FLAGS"
   export PEGASUS_EXTRA_LINK_FLAGS="-pie"
 export PEGASUS_ROOT=$RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION export PEGASUS_ROOT=$RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION
 export PEGASUS_HOME=$RPM_BUILD_ROOT/usr/pegasus export PEGASUS_HOME=$RPM_BUILD_ROOT/usr/pegasus
 %ifarch ia64 x86_64 %ifarch ia64 x86_64
Line 104 
Line 89 
 %else %else
 %ifarch s390 %ifarch s390
 %define PEGASUS_HARDWARE_PLATFORM LINUX_ZSERIES_GNU %define PEGASUS_HARDWARE_PLATFORM LINUX_ZSERIES_GNU
 export  PEGASUS_EXTRA_C_FLAGS="$PEGASUS_EXTRA_C_FLAGS -fsigned-char"  export  PEGASUS_EXTRA_C_FLAGS="PEGASUS_EXTRA_C_FLAGS -fsigned-char"
 %else %else
 %ifarch s390x zseries %ifarch s390x zseries
 %define PEGASUS_HARDWARE_PLATFORM LINUX_ZSERIES64_GNU %define PEGASUS_HARDWARE_PLATFORM LINUX_ZSERIES64_GNU
 export  PEGASUS_EXTRA_C_FLAGS="$PEGASUS_EXTRA_C_FLAGS -fsigned-char"  export  PEGASUS_EXTRA_C_FLAGS="PEGASUS_EXTRA_C_FLAGS -fsigned-char"
 %else %else
 %define PEGASUS_HARDWARE_PLATFORM LINUX_IX86_GNU %define PEGASUS_HARDWARE_PLATFORM LINUX_IX86_GNU
 %endif %endif
Line 147 
Line 132 
 %define PEGASUS_SAMPLES_DIR  /opt/tog-pegasus/samples %define PEGASUS_SAMPLES_DIR  /opt/tog-pegasus/samples
 %define PEGASUS_INCLUDE_DIR  /opt/tog-pegasus/include %define PEGASUS_INCLUDE_DIR  /opt/tog-pegasus/include
 %define PEGASUS_HTML_DIR     /opt/tog-pegasus/html %define PEGASUS_HTML_DIR     /opt/tog-pegasus/html
   
 make --directory=mak -f SDKMakefile stageSDK \ make --directory=mak -f SDKMakefile stageSDK \
           PEGASUS_STAGING_DIR=%PEGASUS_STAGING_DIR \           PEGASUS_STAGING_DIR=%PEGASUS_STAGING_DIR \
           PEGASUS_SAMPLES_DIR=%PEGASUS_SAMPLES_DIR \           PEGASUS_SAMPLES_DIR=%PEGASUS_SAMPLES_DIR \
           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 \  
         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
 %define PEGASUS_DEST_LIB_DIR   %PEGASUS_PROD_DIR/lib %define PEGASUS_DEST_LIB_DIR   %PEGASUS_PROD_DIR/lib
Line 167 
Line 146 
 %define PEGASUS_SBIN_DIR       %PEGASUS_PROD_DIR/sbin %define PEGASUS_SBIN_DIR       %PEGASUS_PROD_DIR/sbin
 %define PEGASUS_BIN_DIR        %PEGASUS_PROD_DIR/bin %define PEGASUS_BIN_DIR        %PEGASUS_PROD_DIR/bin
 %define PEGASUS_PRODSHARE_DIR  %PEGASUS_PROD_DIR/share %define PEGASUS_PRODSHARE_DIR  %PEGASUS_PROD_DIR/share
 %define PEGASUS_DOC_DIR        %PEGASUS_PRODSHARE_DIR/doc  
 %define PEGASUS_MAN_DIR        %PEGASUS_PRODSHARE_DIR/man %define PEGASUS_MAN_DIR        %PEGASUS_PRODSHARE_DIR/man
 %define PEGASUS_MANUSER_DIR    %PEGASUS_MAN_DIR/man1 %define PEGASUS_MANUSER_DIR    %PEGASUS_MAN_DIR/man1
 %define PEGASUS_MANADMIN_DIR   %PEGASUS_MAN_DIR/man8 %define PEGASUS_MANADMIN_DIR   %PEGASUS_MAN_DIR/man8
 %define PEGASUS_VARDATA_DIR    /var/opt/tog-pegasus %define PEGASUS_VARDATA_DIR    /var/opt/tog-pegasus
 %define PEGASUS_REPOSITORY_DIR      %PEGASUS_VARDATA_DIR/repository %define PEGASUS_REPOSITORY_DIR      %PEGASUS_VARDATA_DIR/repository
 %define PEGASUS_PREV_REPOSITORY_DIR %PEGASUS_VARDATA_DIR/prev_repository  
 %define PEGASUS_VARDATA_CACHE_DIR   %PEGASUS_VARDATA_DIR/cache %define PEGASUS_VARDATA_CACHE_DIR   %PEGASUS_VARDATA_DIR/cache
 %define PEGASUS_LOCAL_AUTH_DIR      %PEGASUS_VARDATA_CACHE_DIR/localauth %define PEGASUS_LOCAL_AUTH_DIR      %PEGASUS_VARDATA_CACHE_DIR/localauth
 %define PEGASUS_MOF_DIR            %PEGASUS_PROD_DIR/mof %define PEGASUS_MOF_DIR            %PEGASUS_PROD_DIR/mof
Line 189 
Line 166 
 %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_STAGING_DIR  $PEGASUS_HOME/stagingDir  
 %define PEGASUS_TEST_BIN_DIR  %PEGASUS_TEST_DIR/bin  
 %define PEGASUS_TEST_LIB_DIR  %PEGASUS_TEST_DIR/lib  
 %define PEGASUS_TEST_MAK_DIR  %PEGASUS_TEST_DIR/mak  
 %endif  
   
 # #
 # Make directories # Make directories
 mkdir -p $RPM_BUILD_ROOT%PEGASUS_VARDATA_DIR/{log,cache,repository} mkdir -p $RPM_BUILD_ROOT%PEGASUS_VARDATA_DIR/{log,cache,repository}
Line 205 
Line 173 
 mkdir -p $RPM_BUILD_ROOT/%PEGASUS_PROVIDER_LIB_DIR mkdir -p $RPM_BUILD_ROOT/%PEGASUS_PROVIDER_LIB_DIR
 mkdir -p $RPM_BUILD_ROOT/%PEGASUS_CONFIG_DIR mkdir -p $RPM_BUILD_ROOT/%PEGASUS_CONFIG_DIR
 mkdir -p $RPM_BUILD_ROOT/%PEGASUS_LOG_DIR mkdir -p $RPM_BUILD_ROOT/%PEGASUS_LOG_DIR
 mkdir -p $RPM_BUILD_ROOT/%PEGASUS_DOC_DIR  
 mkdir -p $RPM_BUILD_ROOT/%PEGASUS_MAN_DIR/{man1,man8} mkdir -p $RPM_BUILD_ROOT/%PEGASUS_MAN_DIR/{man1,man8}
 mkdir -p $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/{CIM28,Pegasus} mkdir -p $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/{CIM28,Pegasus}
 mkdir -p $RPM_BUILD_ROOT%PEGASUS_LOCAL_DOMAIN_SOCKET_DIR mkdir -p $RPM_BUILD_ROOT%PEGASUS_LOCAL_DOMAIN_SOCKET_DIR
Line 442 
Line 409 
 install -D -m 0744 %PEGASUS_INSTALL_SCRIPT_DIR/settogpath $RPM_BUILD_ROOT%PEGASUS_SBIN_DIR/settogpath install -D -m 0744 %PEGASUS_INSTALL_SCRIPT_DIR/settogpath $RPM_BUILD_ROOT%PEGASUS_SBIN_DIR/settogpath
  
 # #
 # doc files  
 #  
 install -D -m 0444  $PEGASUS_ROOT/doc/Admin_Guide_Release_2.4.pdf $RPM_BUILD_ROOT%PEGASUS_DOC_DIR/Admin_Guide_Release_2.4.pdf  
   
 #  
 # man pages # man pages
 # #
 install -D -m 0444  $PEGASUS_ROOT/rpm/manLinux/man1.Z/cimmof.1 $RPM_BUILD_ROOT%PEGASUS_MANUSER_DIR/cimmof.1 install -D -m 0444  $PEGASUS_ROOT/rpm/manLinux/man1.Z/cimmof.1 $RPM_BUILD_ROOT%PEGASUS_MANUSER_DIR/cimmof.1
Line 578 
Line 540 
 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  
 #  
 %define TEST_DEST_PATH     $RPM_BUILD_ROOT%PEGASUS_TEST_DIR  
 mkdir -p %TEST_DEST_PATH/{bin,lib,mak}  
 #  
 # Test Repository  
 #  
 %define PEGASUS_TEST_REPOSITORY_DIR %PEGASUS_VARDATA_DIR/testrepository  
 mkdir -p  $RPM_BUILD_ROOT%PEGASUS_TEST_REPOSITORY_DIR  
 cp -rf %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_REPOSITORY_DIR/*  $RPM_BUILD_ROOT%PEGASUS_TEST_REPOSITORY_DIR  
   
 install -D -m 0444 %PEGASUS_TEST_STAGING_DIR/%PEGASUS_TEST_DIR/Makefile %TEST_DEST_PATH/Makefile  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/CompAssoc $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/CompAssoc  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/InvokeMethod2 $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/InvokeMethod2  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/IPC $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/IPC  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestAbstract $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestAbstract  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestArray $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestArray  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestBase64 $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestBase64  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestClassDecl $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestClassDecl  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestClient $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestClient  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestDateTime $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestDateTime  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestFlavor $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestFlavor  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestFormatter $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestFormatter  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestHashTable $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestHashTable  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestInstanceDecl $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestInstanceDecl  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestLogger $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestLogger  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestMethod $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestMethod  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestObject $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestObject  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestOperationContext $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestOperationContext  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestParameter $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestParameter  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestParamValue $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestParamValue  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestProperty $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestProperty  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestQualifier $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestQualifier  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestQualifierDecl $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestQualifierDecl  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestQualifierList $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestQualifierList  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestQueue $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestQueue  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestReference $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestReference  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestResolve $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestResolve  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestResponseHandler $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestResponseHandler  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestScope $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestScope  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestStack $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestStack  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestStopwatch $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestStopwatch  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestString $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestString  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestStrToInstName $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestStrToInstName  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestTimeValue $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestTimeValue  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestToMof $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestToMof  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestValidateClass $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestValidateClass  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestValue $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestValue  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TracerTest $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TracerTest  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/UserManagerTest $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/UserManagerTest  
 install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_LIB_DIR/libSampleFamilyProvider.so.1   $RPM_BUILD_ROOT%PEGASUS_TEST_LIB_DIR/libSampleFamilyProvider.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_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 650 
Line 553 
   #   #
   # Save the current repository to prev_repository.   # Save the current repository to prev_repository.
   #   #
   if [[ -d %PEGASUS_REPOSITORY_DIR ]]  
     REPOSITORY_LOC=%PEGASUS_REPOSITORY_DIR
     PREV_REPOSITORY_LOC=%PEGASUS_REPOSITORY_DIR"/prev_repository"
   
     if [[ -d $REPOSITORY_LOC ]]
   then   then
       if [[ -d %PEGASUS_PREV_REPOSITORY_DIR ]]        if [[ -d $PREV_REPOSITORY_LOC ]]
       then       then
         mv %PEGASUS_PREV_REPOSITORY_DIR %PEGASUS_PREV_REPOSITORY_DIR`date '+%Y-%m-%d-%s.%N'`.rpmsave;            rm -rf $PREV_REPOSITORY_LOC
       fi       fi
  
       mv %PEGASUS_REPOSITORY_DIR %PEGASUS_PREV_REPOSITORY_DIR        mv $REPOSITORY_LOC $PREV_REPOSITORY_LOC
       mkdir %PEGASUS_REPOSITORY_DIR        mkdir $REPOSITORY_LOC
   fi   fi
 fi fi
  
Line 678 
Line 585 
 ln -sf libpegprovider.so.1 libpegprovider.so ln -sf libpegprovider.so.1 libpegprovider.so
 ln -sf libDefaultProviderManager.so.1 libDefaultProviderManager.so ln -sf libDefaultProviderManager.so.1 libDefaultProviderManager.so
 ln -sf libCMPIProviderManager.so.1 libCMPIProviderManager.so ln -sf libCMPIProviderManager.so.1 libCMPIProviderManager.so
 ln -sf libCIMxmlIndicationHandler.so.1 libCIMxmlIndicationHandler.so  
  
 # Create symbolic links for provider libs # Create symbolic links for provider libs
 # #
Line 695 
Line 601 
 #  Generate a self signed node certificate #  Generate a self signed node certificate
 # #
 echo " Generating SSL certificates... " echo " Generating SSL certificates... "
   HOSTNAME=`uname -n`
 echo "[ req ]" > %PEGASUS_CONFIG_DIR/ssl.cnf echo "[ req ]" > %PEGASUS_CONFIG_DIR/ssl.cnf
 echo "distinguished_name     = req_distinguished_name"  >> %PEGASUS_CONFIG_DIR/ssl.cnf echo "distinguished_name     = req_distinguished_name"  >> %PEGASUS_CONFIG_DIR/ssl.cnf
 echo "prompt                 = no"  >> %PEGASUS_CONFIG_DIR/ssl.cnf echo "prompt                 = no"  >> %PEGASUS_CONFIG_DIR/ssl.cnf
Line 704 
Line 611 
 echo "L                      = Reading" >> %PEGASUS_CONFIG_DIR/ssl.cnf echo "L                      = Reading" >> %PEGASUS_CONFIG_DIR/ssl.cnf
 echo "O                      = The Open Group" >> %PEGASUS_CONFIG_DIR/ssl.cnf echo "O                      = The Open Group" >> %PEGASUS_CONFIG_DIR/ssl.cnf
 echo "OU                     = The OpenPegasus Project" >> %PEGASUS_CONFIG_DIR/ssl.cnf echo "OU                     = The OpenPegasus Project" >> %PEGASUS_CONFIG_DIR/ssl.cnf
 echo "CN                     = `host \`hostname\`|cut -d\" \" -f1`" >> %PEGASUS_CONFIG_DIR/ssl.cnf  echo "CN                     = $HOSTNAME" >> %PEGASUS_CONFIG_DIR/ssl.cnf
 chmod 400 %PEGASUS_CONFIG_DIR/ssl.cnf chmod 400 %PEGASUS_CONFIG_DIR/ssl.cnf
 chown root %PEGASUS_CONFIG_DIR/ssl.cnf chown root %PEGASUS_CONFIG_DIR/ssl.cnf
 chgrp root %PEGASUS_CONFIG_DIR/ssl.cnf chgrp root %PEGASUS_CONFIG_DIR/ssl.cnf
  
 openssl req -x509 -days 3650 -newkey rsa:2048 \  openssl req -x509 -days 365 -newkey rsa:2048 \
    -nodes -config %PEGASUS_CONFIG_DIR/ssl.cnf   \    -nodes -config %PEGASUS_CONFIG_DIR/ssl.cnf   \
    -keyout %PEGASUS_CONFIG_DIR/key.pem -out %PEGASUS_CONFIG_DIR/cert.pem 2>>%INSTALL_LOG    -keyout %PEGASUS_CONFIG_DIR/key.pem -out %PEGASUS_CONFIG_DIR/cert.pem 2>>%INSTALL_LOG
 chmod 700 %PEGASUS_CONFIG_DIR/*.pem  
 cat %PEGASUS_CONFIG_DIR/key.pem > %PEGASUS_CONFIG_DIR/file_2048.pem cat %PEGASUS_CONFIG_DIR/key.pem > %PEGASUS_CONFIG_DIR/file_2048.pem
 chmod 400 %PEGASUS_CONFIG_DIR/file_2048.pem  
 cat %PEGASUS_CONFIG_DIR/cert.pem > %PEGASUS_CONFIG_DIR/server_2048.pem cat %PEGASUS_CONFIG_DIR/cert.pem > %PEGASUS_CONFIG_DIR/server_2048.pem
 chmod 400 %PEGASUS_CONFIG_DIR/server_2048.pem  
 cat %PEGASUS_CONFIG_DIR/cert.pem > %PEGASUS_CONFIG_DIR/client_2048.pem cat %PEGASUS_CONFIG_DIR/cert.pem > %PEGASUS_CONFIG_DIR/client_2048.pem
 chmod 400 %PEGASUS_CONFIG_DIR/client_2048.pem  chmod 700 %PEGASUS_CONFIG_DIR/*.pem
  
 rm -f %PEGASUS_CONFIG_DIR/key.pem %PEGASUS_CONFIG_DIR/cert.pem rm -f %PEGASUS_CONFIG_DIR/key.pem %PEGASUS_CONFIG_DIR/cert.pem
  
Line 728 
Line 633 
 else else
     cp %PEGASUS_CONFIG_DIR/server_2048.pem %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_CERT_FILE     cp %PEGASUS_CONFIG_DIR/server_2048.pem %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_CERT_FILE
     cp %PEGASUS_CONFIG_DIR/file_2048.pem %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_KEY_FILE     cp %PEGASUS_CONFIG_DIR/file_2048.pem %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_KEY_FILE
     chmod 400 %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_KEY_FILE      chmod 400 %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_CERT_FILE %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_KEY_FILE
     chmod 444 %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_CERT_FILE  
 fi fi
  
 if [ -f %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_TRUSTSTORE ] if [ -f %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_TRUSTSTORE ]
Line 737 
Line 641 
     echo "WARNING: %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_TRUSTSTORE SSL Certificate trust store already exists."     echo "WARNING: %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_TRUSTSTORE SSL Certificate trust store already exists."
 else else
     cp %PEGASUS_CONFIG_DIR/client_2048.pem %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_TRUSTSTORE     cp %PEGASUS_CONFIG_DIR/client_2048.pem %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_TRUSTSTORE
     chmod 444 %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_TRUSTSTORE      chmod 400 %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_TRUSTSTORE
 fi fi
  
 echo " To start Pegasus manually:" echo " To start Pegasus manually:"
Line 748 
Line 652 
 echo " run /opt/tog-pegasus/sbin/settogpath."; echo " run /opt/tog-pegasus/sbin/settogpath.";
 fi fi
  
 %if %{PEGASUS_BUILD_TEST_RPM}  
 %post test  
 /etc/init.d/tog-pegasus stop  
 cd %PEGASUS_VARDATA_DIR  
 mv repository repository.bak  
 mv testrepository repository  
   
 cd %PEGASUS_TEST_DIR  
 make create_providerlinks  
 make tests  
 %endif  
   
 %preun %preun
 if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
 # Check if the cimserver is running # Check if the cimserver is running
Line 788 
Line 680 
 %dir %attr(-,root,root) %PEGASUS_LOG_DIR %dir %attr(-,root,root) %PEGASUS_LOG_DIR
 %dir %attr(-,root,root) %PEGASUS_PROVIDER_LIB_DIR %dir %attr(-,root,root) %PEGASUS_PROVIDER_LIB_DIR
 %dir %attr(1555,root,root) %PEGASUS_LOCAL_DOMAIN_SOCKET_DIR %dir %attr(1555,root,root) %PEGASUS_LOCAL_DOMAIN_SOCKET_DIR
 %defattr(-,root,root)  %defattr(0755,root,root)
 %PEGASUS_REPOSITORY_DIR %PEGASUS_REPOSITORY_DIR
   %defattr(-,root,root)
 %doc %PEGASUS_PROD_DIR/%PEGASUS_LICENSE_FILE %doc %PEGASUS_PROD_DIR/%PEGASUS_LICENSE_FILE
 %doc %PEGASUS_DOC_DIR/Admin_Guide_Release_2.4.pdf  
 %doc %PEGASUS_MANUSER_DIR/cimmof.1 %doc %PEGASUS_MANUSER_DIR/cimmof.1
 %doc %PEGASUS_MANUSER_DIR/cimprovider.1 %doc %PEGASUS_MANUSER_DIR/cimprovider.1
 %doc %PEGASUS_MANUSER_DIR/osinfo.1 %doc %PEGASUS_MANUSER_DIR/osinfo.1
Line 976 
Line 868 
 %attr(-,root,root) %PEGASUS_PROVIDER_LIB_DIR/libProcessProvider.so.1 %attr(-,root,root) %PEGASUS_PROVIDER_LIB_DIR/libProcessProvider.so.1
  
  
 %files devel  %files sdk
 %defattr(0444,root,root) %defattr(0444,root,root)
 %attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Client/CIMClientException.h %attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Client/CIMClientException.h
 %attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Client/CIMClient.h %attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Client/CIMClient.h
Line 1074 
Line 966 
 %attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/Load/MethodProviderR.mof %attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/Load/MethodProviderR.mof
 %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  
 %attr(-,root,root) %PEGASUS_TEST_DIR/Makefile  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/CompAssoc  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/InvokeMethod2  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/IPC  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestAbstract  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestArray  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestBase64  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestClassDecl  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestClient  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestDateTime  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestFlavor  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestFormatter  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestHashTable  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestInstanceDecl  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestLogger  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestMethod  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestObject  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestOperationContext  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestParameter  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestParamValue  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestProperty  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestQualifier  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestQualifierDecl  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestQualifierList  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestQueue  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestReference  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestResolve  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestResponseHandler  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestScope  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestStack  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestStopwatch  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestString  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestStrToInstName  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestTimeValue  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestToMof  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestValidateClass  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestValue  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TracerTest  
 %attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/UserManagerTest  
 %attr(-,root,root) %PEGASUS_TEST_LIB_DIR/libSampleFamilyProvider.so.1  
 %attr(-,root,root) %PEGASUS_TEST_LIB_DIR/libSampleInstanceProvider.so.1  
 %attr(-,root,root) %PEGASUS_TEST_LIB_DIR/libSampleMethodProvider.so.1  
 %attr(-,root,root) %PEGASUS_TEST_MAK_DIR/commands.mak  
 %PEGASUS_TEST_REPOSITORY_DIR  
 %endif  
   

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