(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.2.2 and 1.120.2.1

version 1.119.2.2, 2009/09/18 15:00:28 version 1.120.2.1, 2009/11/18 14:00:29
Line 40 
Line 40 
 # #
  
 %define packageVersion 1 %define packageVersion 1
 Version: 2.9.2  Version: 2.10.0
 Release: %{packageVersion}%{?LINUX_VERSION:.%{LINUX_VERSION}} Release: %{packageVersion}%{?LINUX_VERSION:.%{LINUX_VERSION}}
 Epoch:   1 Epoch:   1
  
Line 53 
Line 53 
 # 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}
  
 Summary:   OpenPegasus WBEM Services for Linux Summary:   OpenPegasus WBEM Services for Linux
 Name:      tog-pegasus Name:      tog-pegasus
Line 70 
Line 72 
 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
 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 157 
Line 163 
 %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 216 
Line 222 
 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
   
 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 450 
Line 462 
 /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 480 
Line 492 
 %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 505 
Line 521 
 %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.2.2  
changed lines
  Added in v.1.120.2.1

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2