(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.20 and 1.20.2.31

version 1.20.2.20, 2005/04/19 19:17:54 version 1.20.2.31, 2005/11/12 04:35:20
Line 32 
Line 32 
 # #
 # Package spec for PEGASUS 2.4 # Package spec for PEGASUS 2.4
 # #
 %define srcRelease 3  
   %{?!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.3RC1
 Release: 3  Release: 1%{?LINUX_VERSION:.%{LINUX_VERSION}}
 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 52 
Line 56 
 communication protocol for monitoring and controlling resources from diverse communication protocol for monitoring and controlling resources from diverse
 sources. sources.
  
 %package sdk  %package devel
 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 sdk  %description devel
 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 %package test
 Summary:      The OpenPegasus Tests Summary:      The OpenPegasus Tests
 Group:        Systems Management/Base Group:        Systems Management/Base
Line 71 
Line 77 
  
 %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 154 
           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 167 
 %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 189 
 %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 205 
 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 442 
 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 578 
 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 635 
 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 631 
Line 654 
   then   then
       if [[ -d %PEGASUS_PREV_REPOSITORY_DIR ]]       if [[ -d %PEGASUS_PREV_REPOSITORY_DIR ]]
       then       then
           rm -rf %PEGASUS_PREV_REPOSITORY_DIR          mv %PEGASUS_PREV_REPOSITORY_DIR %PEGASUS_PREV_REPOSITORY_DIR`date '+%Y-%m-%d-%s.%N'`.rpmsave;
       fi       fi
  
       mv %PEGASUS_REPOSITORY_DIR %PEGASUS_PREV_REPOSITORY_DIR       mv %PEGASUS_REPOSITORY_DIR %PEGASUS_PREV_REPOSITORY_DIR
Line 691 
Line 714 
    -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 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/%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/%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/%PEGASUS_CONFIG_DIR/client_2048.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 725 
Line 748 
 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 734 
Line 758 
 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 766 
Line 791 
 %defattr(-,root,root) %defattr(-,root,root)
 %PEGASUS_REPOSITORY_DIR %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 902 
Line 928 
 %attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_OperatingSystem20R.mof %attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_OperatingSystem20R.mof
 %attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_UnixProcess20.mof %attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_UnixProcess20.mof
 %attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_UnixProcess20R.mof %attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_UnixProcess20R.mof
 %config %attr(-,root,root) %PEGASUS_VARDATA_DIR/%PEGASUS_PLANNED_CONFIG_FILE  %config(noreplace) %attr(-,root,root) %PEGASUS_VARDATA_DIR/%PEGASUS_PLANNED_CONFIG_FILE
 %config %attr(-,root,root) /etc/init.d/tog-pegasus  %config(noreplace) %attr(-,root,root) /etc/init.d/tog-pegasus
 %config %attr(-,root,root) %PAM_CONF/wbem  %config(noreplace) %attr(-,root,root) %PAM_CONF/wbem
 %attr(0544,root,root) %PEGASUS_SBIN_DIR/cimauth %attr(0544,root,root) %PEGASUS_SBIN_DIR/cimauth
 %attr(0544,root,root) %PEGASUS_SBIN_DIR/cimserver %attr(0544,root,root) %PEGASUS_SBIN_DIR/cimserver
 %attr(0544,root,root) %PEGASUS_SBIN_DIR/cimservera %attr(0544,root,root) %PEGASUS_SBIN_DIR/cimservera
Line 950 
Line 976 
 %attr(-,root,root) %PEGASUS_PROVIDER_LIB_DIR/libProcessProvider.so.1 %attr(-,root,root) %PEGASUS_PROVIDER_LIB_DIR/libProcessProvider.so.1
  
  
 %files sdk  %files devel
 %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 1049 
Line 1075 
 %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 1094 
Line 1121 
 %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.20  
changed lines
  Added in v.1.20.2.31
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2