(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.102 and 1.109

version 1.102, 2007/09/12 20:23:46 version 1.109, 2008/03/08 00:59:13
Line 41 
Line 41 
 # be lost the next time this file is regenerated and submitted to CVS. # be lost the next time this file is regenerated and submitted to CVS.
 # #
  
 %define packageVersion 2  %define packageVersion 1
 Version: 2.7.0  Version: 2.8.0
 Release: %{packageVersion}%{?LINUX_VERSION:.%{LINUX_VERSION}} Release: %{packageVersion}%{?LINUX_VERSION:.%{LINUX_VERSION}}
 Epoch:   1 Epoch:   1
  
Line 159 
Line 159 
 %global PEGASUS_REPOSITORY_PARENT_DIR /var/lib/Pegasus %global PEGASUS_REPOSITORY_PARENT_DIR /var/lib/Pegasus
 %global PEGASUS_PREV_REPOSITORY_DIR /var/lib/Pegasus/prev_repository %global PEGASUS_PREV_REPOSITORY_DIR /var/lib/Pegasus/prev_repository
 %global PEGASUS_SBIN_DIR /usr/sbin %global PEGASUS_SBIN_DIR /usr/sbin
 %global PEGASUS_DOC_DIR /usr/share/doc/tog-pegasus-2.7  %global PEGASUS_DOC_DIR /usr/share/doc/tog-pegasus-2.8
  
 %global PEGASUS_RPM_ROOT  $RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION %global PEGASUS_RPM_ROOT  $RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION
 %global PEGASUS_RPM_HOME %PEGASUS_RPM_ROOT/build %global PEGASUS_RPM_HOME %PEGASUS_RPM_ROOT/build
Line 295 
Line 295 
 if [ $1 -eq 2 ]; then if [ $1 -eq 2 ]; then
     rm -f %PEGASUS_LOCAL_DOMAIN_SOCKET_PATH;     rm -f %PEGASUS_LOCAL_DOMAIN_SOCKET_PATH;
     rm -f %PEGASUS_CIMSERVER_START_FILE;     rm -f %PEGASUS_CIMSERVER_START_FILE;
     rm -f %CIMSERVER_LOCK_FILE;      rm -f %PEGASUS_CIMSERVER_START_LOCK_FILE;
 fi fi
 # #
 # End of section pegasus/rpm/tog-specfiles/tog-pegasus-pre.spec # End of section pegasus/rpm/tog-specfiles/tog-pegasus-pre.spec
Line 342 
Line 342 
 # #
    export PEGASUS_ARCH_LIB=%PEGASUS_ARCH_LIB    export PEGASUS_ARCH_LIB=%PEGASUS_ARCH_LIB
  
    if [ -d %PEGASUS_PREV_REPOSITORY_DIR ]; then  
        # Running Repository Upgrade utility  
        %PEGASUS_SBIN_DIR/repupgrade %PEGASUS_PREV_REPOSITORY_DIR \  
            %PEGASUS_REPOSITORY_DIR 2>>%PEGASUS_INSTALL_LOG  
        /bin/tar -C %PEGASUS_REPOSITORY_PARENT_DIR -cf \  
            %PEGASUS_PREV_REPOSITORY_DIR`date '+%Y-%m-%d-%s.%N'`.tar \  
            %PEGASUS_PREV_REPOSITORY_DIR_NAME  
        rm -rf %PEGASUS_PREV_REPOSITORY_DIR  
    fi  
    if [ $1 -eq 1 ]; then    if [ $1 -eq 1 ]; then
 %if %{AUTOSTART} %if %{AUTOSTART}
        /sbin/chkconfig --add tog-pegasus        /sbin/chkconfig --add tog-pegasus
Line 364 
Line 355 
 # End of section pegasus/rpm/tog-specfiles/tog-pegasus-post.spec # End of section pegasus/rpm/tog-specfiles/tog-pegasus-post.spec
  
 elif [ $1 -gt 1 ]; then elif [ $1 -gt 1 ]; then
    if [ -d %PEGASUS_PREV_REPOSITORY_DIR ]; then  
      # Running Repository Upgrade utility  
      %PEGASUS_SBIN_DIR/repupgrade 2>>%PEGASUS_INSTALL_LOG  
    fi  
    # Check if the cimserver is running    # Check if the cimserver is running
    isRunning=`ps -el | grep cimserver | grep -v "grep cimserver"`    isRunning=`ps -el | grep cimserver | grep -v "grep cimserver"`
    if [ "$isRunning" ]; then    if [ "$isRunning" ]; then
        /etc/init.d/tog-pegasus stop        /etc/init.d/tog-pegasus stop
    fi    fi
      if [ -d %PEGASUS_PREV_REPOSITORY_DIR ]; then
          # The old repository was moved to /var/lib/Pegasus/prev_repository. It should now be upgraded to the new repository /var/lib/Pegasus/repository.
          %PEGASUS_SBIN_DIR/repupgrade >> %PEGASUS_INSTALL_LOG 2>&1
          chown -R cimsrvr %PEGASUS_REPOSITORY_DIR
          chgrp -R cimsrvr %PEGASUS_REPOSITORY_DIR
      fi
    if [ -f %PEGASUS_TRACE_FILE_PATH ]; then    if [ -f %PEGASUS_TRACE_FILE_PATH ]; then
      /bin/mv %PEGASUS_TRACE_FILE_PATH %PEGASUS_TRACE_FILE_PATH-`date '+%Y-%m-%d-%R'`      /bin/mv %PEGASUS_TRACE_FILE_PATH %PEGASUS_TRACE_FILE_PATH-`date '+%Y-%m-%d-%R'`
    fi    fi
Line 404 
Line 397 
 # End of section pegasus/rpm/tog-specfiles/tog-pegasus-preun.spec # End of section pegasus/rpm/tog-specfiles/tog-pegasus-preun.spec
  
 %preun devel %preun devel
   # Check if the SDK has been setup
   if [ -f /usr/share/Pegasus/samples/SDKIsSetup ]; then
      make --directory /usr/share/Pegasus/samples -s unsetupSDK
      if [ $? != 0 ]; then
         echo "++++++++++++++++++++++++++++++++++++++++++++++" >&2
         echo "ERROR: Failed to deregister sample providers." >&2
         echo "To remove the SDK rpm without deregistering" >&2
         echo "the sample providers, first remove file" >&2
         echo "/usr/share/Pegasus/samples/SDKIsSetup," >&2
         echo "then remove SDK rpm." >&2
         echo "++++++++++++++++++++++++++++++++++++++++++++++" >&2
         exit 1
      fi
   fi
 make --directory /usr/share/Pegasus/samples -s clean make --directory /usr/share/Pegasus/samples -s clean
  
 %if %{PEGASUS_BUILD_TEST_RPM} %if %{PEGASUS_BUILD_TEST_RPM}
Line 437 
Line 444 
 %files %files
 %defattr(600, cimsrvr, cimsrvr, 700) %defattr(600, cimsrvr, cimsrvr, 700)
 /var/lib/Pegasus/repository /var/lib/Pegasus/repository
   
   %defattr(644,root,pegasus,755)
   /usr/share/Pegasus/mof
   
 %defattr(600, root, pegasus, 755) %defattr(600, root, pegasus, 755)
 %dir /usr/share/doc/tog-pegasus-2.7  %dir /usr/share/doc/tog-pegasus-2.8
 %dir /usr/share/Pegasus %dir /usr/share/Pegasus
 %dir /usr/share/Pegasus/scripts %dir /usr/share/Pegasus/scripts
 %dir /usr/share/Pegasus/mof  
 %dir /usr/share/Pegasus/mof/CIM29  
 %dir /usr/share/Pegasus/mof/Pegasus  
 %dir /var/lib/Pegasus %dir /var/lib/Pegasus
 %dir /var/lib/Pegasus/cache %dir /var/lib/Pegasus/cache
 %dir /var/lib/Pegasus/log %dir /var/lib/Pegasus/log
Line 456 
Line 464 
 %dir %attr(1755,cimsrvr,cimsrvr) /var/run/tog-pegasus/socket %dir %attr(1755,cimsrvr,cimsrvr) /var/run/tog-pegasus/socket
 %dir %attr(1777,root,pegasus) /var/lib/Pegasus/cache/trace %dir %attr(1777,root,pegasus) /var/lib/Pegasus/cache/trace
  
 /usr/share/Pegasus/mof/CIM29/*  
 /usr/share/Pegasus/mof/Pegasus/*  
   
 %config %attr(750,root,pegasus) /etc/init.d/tog-pegasus %config %attr(750,root,pegasus) /etc/init.d/tog-pegasus
 %config(noreplace) %attr(644,  root, pegasus) /var/lib/Pegasus/cimserver_planned.conf  %config(noreplace) %attr(644,root,root) /var/lib/Pegasus/cimserver_planned.conf
 %config(noreplace) /etc/Pegasus/access.conf %config(noreplace) /etc/Pegasus/access.conf
 %config(noreplace) /etc/pam.d/wbem %config(noreplace) /etc/pam.d/wbem
  
Line 478 
Line 483 
 %attr(644,root,pegasus) /usr/share/man/man1/* %attr(644,root,pegasus) /usr/share/man/man1/*
 %attr(644,root,pegasus) /usr/share/man/man8/* %attr(644,root,pegasus) /usr/share/man/man8/*
  
 %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.7/Admin_Guide_Release.pdf  %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.8/Admin_Guide_Release.pdf
 %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.7/PegasusSSLGuidelines.htm  %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.8/PegasusSSLGuidelines.htm
 %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.7/license.txt  %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.8/license.txt
 /usr/%PEGASUS_ARCH_LIB/libpegclient.so /usr/%PEGASUS_ARCH_LIB/libpegclient.so
 /usr/%PEGASUS_ARCH_LIB/libpegcommon.so /usr/%PEGASUS_ARCH_LIB/libpegcommon.so
 /usr/%PEGASUS_ARCH_LIB/libpegprovider.so /usr/%PEGASUS_ARCH_LIB/libpegprovider.so
Line 496 
Line 501 
 %defattr(644,root,pegasus,755) %defattr(644,root,pegasus,755)
 /usr/share/Pegasus/samples /usr/share/Pegasus/samples
 /usr/include/Pegasus /usr/include/Pegasus
 /usr/share/doc/tog-pegasus-2.7/*  /usr/share/doc/tog-pegasus-2.8/*
 /usr/share/Pegasus/html /usr/share/Pegasus/html
 %attr(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/*.so %attr(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/*.so
  

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