(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.121 and 1.122

version 1.121, 2009/07/28 14:10:26 version 1.122, 2009/12/15 10:52:32
Line 39 
Line 39 
 # 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 Flavor  tog
 %define packageVersion 1 %define packageVersion 1
 Version: 2.10.0 Version: 2.10.0
 Release: %{packageVersion}%{?LINUX_VERSION:.%{LINUX_VERSION}} Release: %{packageVersion}%{?LINUX_VERSION:.%{LINUX_VERSION}}
Line 57 
Line 58 
 %{?!JMPI_PROVIDER_REQUESTED: %define JMPI_PROVIDER_REQUESTED 0} %{?!JMPI_PROVIDER_REQUESTED: %define JMPI_PROVIDER_REQUESTED 0}
  
 Summary:   OpenPegasus WBEM Services for Linux Summary:   OpenPegasus WBEM Services for Linux
 Name:      tog-pegasus  Name:      %{Flavor}-pegasus
 Group:     Systems Management/Base Group:     Systems Management/Base
 License:   Open Group Pegasus Open Source License:   Open Group Pegasus Open Source
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Line 101 
Line 102 
 # Start of section pegasus/rpm/tog-specfiles/tog-pegasus-desc.spec # Start of section pegasus/rpm/tog-specfiles/tog-pegasus-desc.spec
 # #
 Conflicts: openwbem Conflicts: openwbem
 Provides: tog-pegasus-cimserver  Provides: %{Flavor}-pegasus-cimserver
 BuildConflicts: tog-pegasus  BuildConflicts: %{Flavor}-pegasus
  
 %description %description
 OpenPegasus WBEM Services for Linux enables management solutions that deliver OpenPegasus WBEM Services for Linux enables management solutions that deliver
Line 174 
Line 175 
 %package devel %package devel
 Summary: The OpenPegasus Software Development Kit Summary: The OpenPegasus Software Development Kit
 Group: Systems Management/Base Group: Systems Management/Base
 Requires: tog-pegasus >= %{version}  Requires: %{Flavor}-pegasus >= %{version}
 Obsoletes: tog-pegasus-sdk  Obsoletes: %{Flavor}-pegasus-sdk
  
 %description devel %description devel
 The OpenPegasus WBEM Services for Linux SDK is the developer's kit for the The OpenPegasus WBEM Services for Linux SDK is the developer's kit for the
Line 187 
Line 188 
 %package test %package test
 Summary: The OpenPegasus Tests Summary: The OpenPegasus Tests
 Group: Systems Management/Base Group: Systems Management/Base
 Requires: tog-pegasus >= %{version}  Requires: %{Flavor}-pegasus >= %{version}
  
 %description test %description test
 The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm. The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm.
Line 299 
Line 300 
 if [ $1 -gt 0 ]; then if [ $1 -gt 0 ]; then
    #  Create the 'pegasus' user and group:    #  Create the 'pegasus' user and group:
    /usr/sbin/groupadd pegasus > /dev/null 2>&1 || :;    /usr/sbin/groupadd pegasus > /dev/null 2>&1 || :;
    /usr/sbin/useradd -c "tog-pegasus OpenPegasus WBEM/CIM services" \     /usr/sbin/useradd -c "%{Flavor}-pegasus OpenPegasus WBEM/CIM services" \
         -g pegasus -s /sbin/nologin -r -d %PEGASUS_VARDATA_DIR pegasus \         -g pegasus -s /sbin/nologin -r -d %PEGASUS_VARDATA_DIR pegasus \
          > /dev/null 2>&1 || :;          > /dev/null 2>&1 || :;
 fi fi
Line 358 
Line 359 
  
    if [ $1 -eq 1 ]; then    if [ $1 -eq 1 ]; then
 %if %{AUTOSTART} %if %{AUTOSTART}
        /sbin/chkconfig --add tog-pegasus         /sbin/chkconfig --add %{Flavor}-pegasus
 %endif %endif
    :;    :;
    elif [ $1 -gt 0 ]; then    elif [ $1 -gt 0 ]; then
        /etc/init.d/tog-pegasus condrestart         /etc/init.d/%{Flavor}-pegasus condrestart
    :;    :;
    fi    fi
 # #
Line 398 
Line 399 
    if [ "$isRunning" ]; then    if [ "$isRunning" ]; then
       %PEGASUS_SBIN_DIR/cimserver -s       %PEGASUS_SBIN_DIR/cimserver -s
    fi    fi
    /sbin/chkconfig --del tog-pegasus;     /sbin/chkconfig --del %{Flavor}-pegasus;
    rm -f %PEGASUS_VARDATA_DIR/cimserver_current.conf;    rm -f %PEGASUS_VARDATA_DIR/cimserver_current.conf;
    [ -d %PEGASUS_REPOSITORY_DIR ]  && rm -rf %PEGASUS_REPOSITORY_DIR;    [ -d %PEGASUS_REPOSITORY_DIR ]  && rm -rf %PEGASUS_REPOSITORY_DIR;
    [ -d %PEGASUS_VARDATA_CACHE_DIR ]  && rm -rf %PEGASUS_VARDATA_CACHE_DIR;    [ -d %PEGASUS_VARDATA_CACHE_DIR ]  && rm -rf %PEGASUS_VARDATA_CACHE_DIR;


Legend:
Removed from v.1.121  
changed lines
  Added in v.1.122

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2