(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.13 and 1.20.2.25

version 1.20.2.13, 2005/03/04 20:17:24 version 1.20.2.25, 2005/08/05 20:58:48
Line 32 
Line 32 
 # #
 # Package spec for PEGASUS 2.4 # Package spec for PEGASUS 2.4
 # #
 %define srcRelease 2  
   %{?!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
 Summary: OpenPegasus WBEM Services for Linux Summary: OpenPegasus WBEM Services for Linux
 Name: tog-pegasus Name: tog-pegasus
 Version: 2.4.1.Beta  Version: 2.4.2RC1
 Release: 2  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 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 97 
Line 103 
 %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 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 158 
Line 166 
 %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
Line 179 
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 192 
Line 204 
 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 428 
Line 441 
 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 559 
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 614 
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 655 
Line 677 
 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 671 
Line 694 
 #  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 681 
Line 703 
 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                     = $HOSTNAME" >> %PEGASUS_CONFIG_DIR/ssl.cnf  echo "CN                     = `host \`hostname\`|cut -d\" \" -f1`" >> %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 365 -newkey rsa:2048 \  openssl req -x509 -days 3650 -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 700 %PEGASUS_CONFIG_DIR/*.pem  chmod 400 %PEGASUS_CONFIG_DIR/client_2048.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 703 
Line 727 
 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_CERT_FILE %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_KEY_FILE      chmod 400 %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 711 
Line 736 
     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 400 %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_TRUSTSTORE      chmod 444 %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_TRUSTSTORE
 fi fi
  
 echo " To start Pegasus manually:" echo " To start Pegasus manually:"
Line 722 
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 731 
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 760 
Line 787 
 %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(0755,root,root)  
 %PEGASUS_REPOSITORY_DIR  
 %defattr(-,root,root) %defattr(-,root,root)
   %PEGASUS_REPOSITORY_DIR
 %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 1047 
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 1092 
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.13  
changed lines
  Added in v.1.20.2.25
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2