(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.119 and 1.122.2.3

version 1.119, 2008/12/16 18:55:38 version 1.122.2.3, 2010/07/20 10:54:25
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.9.0  Version: 2.10.1
 Release: %{packageVersion}%{?LINUX_VERSION:.%{LINUX_VERSION}} Release: %{packageVersion}%{?LINUX_VERSION:.%{LINUX_VERSION}}
 Epoch:   1 Epoch:   1
  
Line 53 
Line 54 
 # Use "rpm -[iU]vh --define 'AUTOSTART 1'" in order to have cimserver enabled # Use "rpm -[iU]vh --define 'AUTOSTART 1'" in order to have cimserver enabled
 # (chkconfig --level=345 tog-pegasus on) after installation. # (chkconfig --level=345 tog-pegasus on) after installation.
 # #
   # Use "rpmbuild --define 'JMPI_PROVIDER_REQUESTED 1'" to include JMPI support.
   %{?!JMPI_PROVIDER_REQUESTED: %define JMPI_PROVIDER_REQUESTED 0}
   
   # Use "rpmbuild --define 'EXTERNAL_SLP_REQUESTED 1'" to include External SLP support.
   %{?!EXTERNAL_SLP_REQUESTED: %define EXTERNAL_SLP_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 70 
Line 76 
 BuildRequires:      bash, sed, grep, coreutils, procps, gcc, gcc-c++ BuildRequires:      bash, sed, grep, coreutils, procps, gcc, gcc-c++
 BuildRequires:      libstdc++, make, pam-devel BuildRequires:      libstdc++, make, pam-devel
 BuildRequires:      openssl-devel >= 0.9.6, e2fsprogs BuildRequires:      openssl-devel >= 0.9.6, e2fsprogs
   %if %{JMPI_PROVIDER_REQUESTED}
   BuildRequires:      gcc-java, libgcj-devel, libgcj, java-1.4.2-gcj-compat
   Requires:           libgcj, java-1.4.2-gcj-compat
   %endif
   %if %{EXTERNAL_SLP_REQUESTED}
   BuildRequires:      openslp
   Requires:           openslp
   %endif
   
 BuildRequires:      net-snmp-devel BuildRequires:      net-snmp-devel
 # #
 # End of section  pegasus/rpm/tog-specfiles/tog-pegasus-buildRequires.spec # End of section  pegasus/rpm/tog-specfiles/tog-pegasus-buildRequires.spec
Line 95 
Line 110 
 # 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 157 
Line 172 
 %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.9  %global PEGASUS_DOC_DIR /usr/share/doc/tog-pegasus-2.10
  
 %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 168 
Line 183 
 %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 181 
Line 196 
 %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 216 
Line 231 
 export PEGASUS_DISPLAYCONSUMER_DIR="$PEGASUS_TMP" export PEGASUS_DISPLAYCONSUMER_DIR="$PEGASUS_TMP"
 %endif %endif
  
   %if %{JMPI_PROVIDER_REQUESTED}
   sed -i 's/PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER=.*$/PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER=true/' $PEGASUS_ENVVAR_FILE
   %else
   sed -i 's/PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER=.*$/PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER=false/' $PEGASUS_ENVVAR_FILE
   %endif
   
   %if %{EXTERNAL_SLP_REQUESTED}
   sed -i 's/PEGASUS_ENABLE_SLP=.*$/PEGASUS_ENABLE_SLP=true/' $PEGASUS_ENVVAR_FILE
   %else
   sed -i 's/PEGASUS_ENABLE_SLP=.*$/PEGASUS_ENABLE_SLP=false/' $PEGASUS_ENVVAR_FILE
   %endif
   
 make -f $PEGASUS_ROOT/Makefile.Release create_ProductVersionFile make -f $PEGASUS_ROOT/Makefile.Release create_ProductVersionFile
 make -f $PEGASUS_ROOT/Makefile.Release create_CommonProductDirectoriesInclude make -f $PEGASUS_ROOT/Makefile.Release create_CommonProductDirectoriesInclude
 make -f $PEGASUS_ROOT/Makefile.Release create_ConfigProductDirectoriesInclude make -f $PEGASUS_ROOT/Makefile.Release create_ConfigProductDirectoriesInclude
Line 287 
Line 314 
 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 335 
Line 362 
    # Create Symbolic Links for Packaged Provider Managers    # Create Symbolic Links for Packaged Provider Managers
    #    #
    ln -sf libCMPIProviderManager.so.1 /usr/%PEGASUS_ARCH_LIB/Pegasus/providerManagers/libCMPIProviderManager.so    ln -sf libCMPIProviderManager.so.1 /usr/%PEGASUS_ARCH_LIB/Pegasus/providerManagers/libCMPIProviderManager.so
      # Create Symbolic Links for SLP library and SLP Provider
      #
    %if %{EXTERNAL_SLP_REQUESTED}
      ln -sf    libpegslp_client.so.1            /usr/%PEGASUS_ARCH_LIB/libpegslp_client.so
      ln -sf    libSLPProvider.so.1            /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libSLPProvider.so
    %endif
  
  
 # Start of section pegasus/rpm/tog-specfiles/tog-pegasus-post.spec # Start of section pegasus/rpm/tog-specfiles/tog-pegasus-post.spec
Line 346 
Line 379 
  
    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 386 
Line 419 
    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_CONFIG_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;
    rm -f %PEGASUS_LOCAL_DOMAIN_SOCKET_PATH;    rm -f %PEGASUS_LOCAL_DOMAIN_SOCKET_PATH;
Line 450 
Line 483 
 /usr/share/Pegasus/mof /usr/share/Pegasus/mof
  
 %defattr(600,root,pegasus,755) %defattr(600,root,pegasus,755)
 %dir /usr/share/doc/tog-pegasus-2.9  %dir /usr/share/doc/tog-pegasus-2.10
 %dir /usr/share/Pegasus %dir /usr/share/Pegasus
 %dir /usr/share/Pegasus/scripts %dir /usr/share/Pegasus/scripts
 %dir /var/lib/Pegasus %dir /var/lib/Pegasus
Line 467 
Line 500 
 %dir %attr(1777,root,pegasus) /var/lib/Pegasus/cache/trace %dir %attr(1777,root,pegasus) /var/lib/Pegasus/cache/trace
  
 %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,root) /var/lib/Pegasus/cimserver_planned.conf  %config(noreplace) %attr(644,root,root) /etc/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 480 
Line 513 
 %attr(755,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
   %if %{JMPI_PROVIDER_REQUESTED}
   %attr(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/*.jar
   /usr/%PEGASUS_ARCH_LIB/libJMPIProviderManager.so
   %endif
 %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(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/Pegasus/providerManagers/*.so.1 %attr(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/Pegasus/providerManagers/*.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(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.9/Admin_Guide_Release.pdf  %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.10/Admin_Guide_Release.pdf
 %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.9/PegasusSSLGuidelines.htm  %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.10/PegasusSSLGuidelines.htm
 %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.9/license.txt  %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.10/license.txt
 %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.9/OpenPegasusNOTICE.txt  %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.10/OpenPegasusNOTICE.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 499 
Line 536 
 /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libComputerSystemProvider.so /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libComputerSystemProvider.so
 /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libOSProvider.so /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libOSProvider.so
 /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libProcessProvider.so /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libProcessProvider.so
    %if %{EXTERNAL_SLP_REQUESTED}
   /usr/%PEGASUS_ARCH_LIB/libpegslp_client.so
   /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libSLPProvider.so
   %endif
 /usr/%PEGASUS_ARCH_LIB/Pegasus/providerManagers/libCMPIProviderManager.so /usr/%PEGASUS_ARCH_LIB/Pegasus/providerManagers/libCMPIProviderManager.so
  
 %files devel %files devel
 %defattr(644,root,pegasus,755) %defattr(644,root,pegasus,755)
 /usr/share/Pegasus/samples /usr/share/Pegasus/samples
 /usr/include/Pegasus /usr/include/Pegasus
 %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.9/SecurityGuidelinesForDevelopers.html  %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.10/SecurityGuidelinesForDevelopers.html
 /usr/share/Pegasus/html /usr/share/Pegasus/html
  
 %if %{PEGASUS_BUILD_TEST_RPM} %if %{PEGASUS_BUILD_TEST_RPM}

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