(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.122.2.3 and 1.123

version 1.122.2.3, 2010/07/20 10:54:25 version 1.123, 2010/04/09 07:02:50
Line 41 
Line 41 
  
 %define Flavor  tog %define Flavor  tog
 %define packageVersion 1 %define packageVersion 1
 Version: 2.10.1  Version: 2.11.0
 Release: %{packageVersion}%{?LINUX_VERSION:.%{LINUX_VERSION}} Release: %{packageVersion}%{?LINUX_VERSION:.%{LINUX_VERSION}}
 Epoch:   1 Epoch:   1
  
Line 57 
Line 57 
 # Use "rpmbuild --define 'JMPI_PROVIDER_REQUESTED 1'" to include JMPI support. # Use "rpmbuild --define 'JMPI_PROVIDER_REQUESTED 1'" to include JMPI support.
 %{?!JMPI_PROVIDER_REQUESTED: %define JMPI_PROVIDER_REQUESTED 0} %{?!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:      %{Flavor}-pegasus Name:      %{Flavor}-pegasus
 Group:     Systems Management/Base Group:     Systems Management/Base
Line 80 
Line 77 
 BuildRequires:      gcc-java, libgcj-devel, libgcj, java-1.4.2-gcj-compat BuildRequires:      gcc-java, libgcj-devel, libgcj, java-1.4.2-gcj-compat
 Requires:           libgcj, java-1.4.2-gcj-compat Requires:           libgcj, java-1.4.2-gcj-compat
 %endif %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 237 
Line 229 
 sed -i 's/PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER=.*$/PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER=false/' $PEGASUS_ENVVAR_FILE sed -i 's/PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER=.*$/PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER=false/' $PEGASUS_ENVVAR_FILE
 %endif %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 362 
Line 348 
    # 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 420 
Line 400 
       %PEGASUS_SBIN_DIR/cimserver -s       %PEGASUS_SBIN_DIR/cimserver -s
    fi    fi
    /sbin/chkconfig --del %{Flavor}-pegasus;    /sbin/chkconfig --del %{Flavor}-pegasus;
    rm -f %PEGASUS_CONFIG_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;
    rm -f %PEGASUS_LOCAL_DOMAIN_SOCKET_PATH;    rm -f %PEGASUS_LOCAL_DOMAIN_SOCKET_PATH;
Line 500 
Line 480 
 %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) /etc/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 536 
Line 516 
 /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

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