(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.98 and 1.106.2.1

version 1.98, 2007/08/10 17:20:49 version 1.106.2.1, 2007/10/30 18:08:56
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.
 # #
  
 Version: 2.7.0  %define packageVersion 1
 Release: 1%{?LINUX_VERSION:.%{LINUX_VERSION}}  Version: 2.7.1
   Release: %{packageVersion}%{?LINUX_VERSION:.%{LINUX_VERSION}}
 Epoch:   1 Epoch:   1
  
 # Start of section pegasus/rpm/tog-specfiles/tog-pegasus-intro.spec # Start of section pegasus/rpm/tog-specfiles/tog-pegasus-intro.spec
Line 55 
Line 56 
 # (chkconfig --level=345 tog-pegasus on) after installation. # (chkconfig --level=345 tog-pegasus on) after installation.
 # #
  
 %define srcRelease 1  
 Summary:   OpenPegasus WBEM Services for Linux Summary:   OpenPegasus WBEM Services for Linux
 Name:      tog-pegasus Name:      tog-pegasus
 Group:     Systems Management/Base Group:     Systems Management/Base
Line 63 
Line 63 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL:       http://www.openpegasus.org URL:       http://www.openpegasus.org
  
 Source:    %{name}-%{version}-%{srcRelease}.tar.gz  Source:    %{name}-%{version}-%{packageVersion}.tar.gz
 # #
 # End of section pegasus/rpm/tog-specfiles/tog-pegasus-intro.spec # End of section pegasus/rpm/tog-specfiles/tog-pegasus-intro.spec
  
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
  
 # When Privilege Separation is enabled, create the 'cimsrvr' user and # When Privilege Separation is enabled, create the 'cimsrvr' user and
 # 'pegasus' group which are used as the context of the cimservermain process  # 'cimsrvr' group which are used as the context of the cimservermain process
 if [ $1 -gt 0 ]; then if [ $1 -gt 0 ]; then
     /usr/sbin/groupadd pegasus > /dev/null 2>&1 || :;      /usr/sbin/groupadd cimsrvr > /dev/null 2>&1 || :;
     /usr/sbin/useradd -c "tog-pegasus OpenPegasus WBEM/CIM services" \     /usr/sbin/useradd -c "tog-pegasus OpenPegasus WBEM/CIM services" \
         -g pegasus -s /sbin/nologin -r -d %PEGASUS_VARDATA_DIR cimsrvr \          -g cimsrvr -s /sbin/nologin -r -d %PEGASUS_VARDATA_DIR cimsrvr \
         > /dev/null 2>&1 || :;         > /dev/null 2>&1 || :;
 fi fi
  
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 428 
Line 435 
 # End of section pegasus/rpm/tog-specfiles/tog-pegasus-postun.spec # End of section pegasus/rpm/tog-specfiles/tog-pegasus-postun.spec
  
 # When Privilege Separation is enabled, delete the 'cimsrvr' user and # When Privilege Separation is enabled, delete the 'cimsrvr' user and
 # 'pegasus' group which are used as the context of the cimservermain process  # 'cimsrvr' group which are used as the context of the cimservermain process
 if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
     /usr/sbin/userdel cimsrvr > /dev/null 2>&1 || :;     /usr/sbin/userdel cimsrvr > /dev/null 2>&1 || :;
     /usr/sbin/groupdel pegasus > /dev/null 2>&1 || :;      /usr/sbin/groupdel cimsrvr > /dev/null 2>&1 || :;
 fi fi
  
 %files %files
 %defattr(600, cimsrvr, pegasus, 700)  %defattr(600, cimsrvr, cimsrvr, 700)
 /var/lib/Pegasus/repository /var/lib/Pegasus/repository
 %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.7
 %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
 %dir /usr/share/Pegasus/mof/CIM29  
 %dir /usr/share/Pegasus/mof/Pegasus %dir /usr/share/Pegasus/mof/Pegasus
 %dir /var/lib/Pegasus %dir /var/lib/Pegasus
 %dir /var/lib/Pegasus/cache %dir /var/lib/Pegasus/cache
Line 452 
Line 458 
 %dir /usr/%PEGASUS_ARCH_LIB/Pegasus/providers %dir /usr/%PEGASUS_ARCH_LIB/Pegasus/providers
  
 %dir %attr(755, root, pegasus) /etc/Pegasus %dir %attr(755, root, pegasus) /etc/Pegasus
 %dir %attr(755, cimsrvr, pegasus) /var/run/tog-pegasus  %dir %attr(755, cimsrvr, cimsrvr) /var/run/tog-pegasus
 %dir %attr(1755,cimsrvr,pegasus) /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/* /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
Line 470 
Line 475 
 %ghost %config(noreplace) /etc/Pegasus/file.pem %ghost %config(noreplace) /etc/Pegasus/file.pem
 %ghost /var/lib/Pegasus/log/install.log %ghost /var/lib/Pegasus/log/install.log
  
 %attr(750,root,pegasus) /usr/sbin/*  %attr(755,root,pegasus) /usr/sbin/*
 %attr(755,root,pegasus) /usr/bin/* %attr(755,root,pegasus) /usr/bin/*
 %attr(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/*.so.1 %attr(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/*.so.1
 %attr(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/*.so.1 %attr(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/*.so.1
 %attr(750,root,pegasus) /usr/share/Pegasus/scripts/* %attr(750,root,pegasus) /usr/share/Pegasus/scripts/*
 %attr(644,root,pegasus) /usr/share/man/man1/* %attr(644,root,pegasus) /usr/share/man/man1/*
 %attr(640,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.7/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.7/PegasusSSLGuidelines.htm
Line 504 
Line 509 
 %files test %files test
 %defattr(-,root,pegasus,-) %defattr(-,root,pegasus,-)
 /usr/share/Pegasus/test /usr/share/Pegasus/test
 %defattr(600,cimsrvr, pegasus,700)  %defattr(600,cimsrvr, cimsrvr,700)
 /var/lib/Pegasus/testrepository /var/lib/Pegasus/testrepository
 %endif %endif

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