(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.86 and 1.94

version 1.86, 2006/03/06 19:10:09 version 1.94, 2007/06/22 17:45:51
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.5RC1  Version: 2.7.0
 Release: 1%{?LINUX_VERSION:.%{LINUX_VERSION}} Release: 1%{?LINUX_VERSION:.%{LINUX_VERSION}}
 Epoch:   1 Epoch:   1
  
Line 64 
Line 64 
 URL:       http://www.openpegasus.org URL:       http://www.openpegasus.org
  
 Source:    %{name}-%{version}-%{srcRelease}.tar.gz Source:    %{name}-%{version}-%{srcRelease}.tar.gz
   #
   # End of section pegasus/rpm/tog-specfiles/tog-pegasus-intro.spec
  
   # Start of section pegasus/rpm/tog-specfiles/tog-pegasus-buildRequires.spec
   #
 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
   BuildRequires:      net-snmp-devel
   #
   # End of section  pegasus/rpm/tog-specfiles/tog-pegasus-buildRequires.spec
   
   # Start of section pegasus/rpm/tog-specfiles/tog-pegasus-requires.spec
   #
 Requires:           bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam Requires:           bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam
 #Requires:          krb5-libs, redhat-lsb, chkconfig, SysVinit, bind-libs #Requires:          krb5-libs, redhat-lsb, chkconfig, SysVinit, bind-libs
 Requires:           e2fsprogs, bind-utils, net-tools Requires:           e2fsprogs, bind-utils, net-tools
Line 80 
Line 90 
 Requires(postun):   bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam Requires(postun):   bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam
 #Requires(postun):  krb5-libs, redhat-lsb, chkconfig, SysVinit, bind-libs #Requires(postun):  krb5-libs, redhat-lsb, chkconfig, SysVinit, bind-libs
 Requires(postun):   e2fsprogs, bind-utils, net-tools Requires(postun):   e2fsprogs, bind-utils, net-tools
   Requires:           net-snmp
   #
   # End of section  pegasus/rpm/tog-specfiles/tog-pegasus-requires.spec
  
   # Start of section pegasus/rpm/tog-specfiles/tog-pegasus-desc.spec
   #
 Conflicts: openwbem Conflicts: openwbem
 Provides: tog-pegasus-cimserver Provides: tog-pegasus-cimserver
 BuildConflicts: tog-pegasus BuildConflicts: tog-pegasus
Line 92 
Line 107 
 communication protocol for monitoring and controlling resources from diverse communication protocol for monitoring and controlling resources from diverse
 sources. sources.
 # #
 # End of section pegasus/rpm/tog-specfiles/tog-pegasus-intro.spec  # End of section pegasus/rpm/tog-specfiles/tog-pegasus-desc.spec
  
 # Start of section pegasus/rpm/tog-specfiles/tog-pegasus-arch.spec # Start of section pegasus/rpm/tog-specfiles/tog-pegasus-arch.spec
 # #
Line 137 
Line 152 
 %global PEGASUS_VARDATA_CACHE_DIR /var/lib/Pegasus/cache %global PEGASUS_VARDATA_CACHE_DIR /var/lib/Pegasus/cache
 %global PEGASUS_LOCAL_DOMAIN_SOCKET_PATH  /var/run/tog-pegasus/socket/cimxml.socket %global PEGASUS_LOCAL_DOMAIN_SOCKET_PATH  /var/run/tog-pegasus/socket/cimxml.socket
 %global PEGASUS_CIMSERVER_START_FILE /var/run/tog-pegasus/cimserver.pid %global PEGASUS_CIMSERVER_START_FILE /var/run/tog-pegasus/cimserver.pid
 %global CIMSERVER_LOCK_FILE /var/run/tog-pegasus/cimserver_start.lock  %global PEGASUS_CIMSERVER_START_LOCK_FILE /var/run/tog-pegasus/cimserver_start.lock
 %global PEGASUS_REPOSITORY_DIR /var/lib/Pegasus/repository %global PEGASUS_REPOSITORY_DIR /var/lib/Pegasus/repository
 %global PEGASUS_PREV_REPOSITORY_DIR_NAME prev_repository %global PEGASUS_PREV_REPOSITORY_DIR_NAME prev_repository
 %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.5  %global PEGASUS_DOC_DIR /usr/share/doc/tog-pegasus-2.7
  
 %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 $RPM_BUILD_ROOT/build/tog-pegasus %global PEGASUS_RPM_HOME $RPM_BUILD_ROOT/build/tog-pegasus
Line 197 
Line 212 
 export PEGASUS_EXTRA_LINK_FLAGS="$RPM_OPT_FLAGS" export PEGASUS_EXTRA_LINK_FLAGS="$RPM_OPT_FLAGS"
 #export PEGASUS_EXTRA_LINK_FLAGS="$RPM_OPT_FLAGS -g -pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack" #export PEGASUS_EXTRA_LINK_FLAGS="$RPM_OPT_FLAGS -g -pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack"
  
   %if %{PEGASUS_BUILD_TEST_RPM}
   export PEGASUS_DISPLAYCONSUMER_DIR=%PEGASUS_VARDATA_DIR/log
   %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
 make -f $PEGASUS_ROOT/Makefile.Release all  make %{?_smp_mflags} -f $PEGASUS_ROOT/Makefile.Release all
 make -f $PEGASUS_ROOT/Makefile.Release repository make -f $PEGASUS_ROOT/Makefile.Release repository
 # #
 # End of section pegasus/rpm/tog-specfiles/tog-pegasus-build.spec # End of section pegasus/rpm/tog-specfiles/tog-pegasus-build.spec
Line 291 
Line 310 
    ln -sf libDefaultProviderManager.so.1 /usr/%PEGASUS_ARCH_LIB/libDefaultProviderManager.so    ln -sf libDefaultProviderManager.so.1 /usr/%PEGASUS_ARCH_LIB/libDefaultProviderManager.so
    ln -sf libCIMxmlIndicationHandler.so.1 /usr/%PEGASUS_ARCH_LIB/libCIMxmlIndicationHandler.so    ln -sf libCIMxmlIndicationHandler.so.1 /usr/%PEGASUS_ARCH_LIB/libCIMxmlIndicationHandler.so
    ln -sf libCMPIProviderManager.so.1 /usr/%PEGASUS_ARCH_LIB/libCMPIProviderManager.so    ln -sf libCMPIProviderManager.so.1 /usr/%PEGASUS_ARCH_LIB/libCMPIProviderManager.so
      ln -sf libsnmpIndicationHandler.so.1 /usr/%PEGASUS_ARCH_LIB/libsnmpIndicationHandler.so
  
    # Create Symbolic Links for Packaged Provider Libraries    # Create Symbolic Links for Packaged Provider Libraries
    #    #
Line 353 
Line 373 
    [ -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;
    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-preun.spec # End of section pegasus/rpm/tog-specfiles/tog-pegasus-preun.spec
Line 384 
Line 404 
  
 %files %files
 %defattr(600, root, pegasus, 755) %defattr(600, root, pegasus, 755)
 %dir /usr/share/doc/tog-pegasus-2.5  %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
Line 398 
Line 418 
 %dir /usr/%PEGASUS_ARCH_LIB/Pegasus %dir /usr/%PEGASUS_ARCH_LIB/Pegasus
 %dir /usr/%PEGASUS_ARCH_LIB/Pegasus/providers %dir /usr/%PEGASUS_ARCH_LIB/Pegasus/providers
  
 %dir %attr(750, root, pegasus) /etc/Pegasus  %dir %attr(755, root, pegasus) /etc/Pegasus
 %dir %attr(1555,root,pegasus) /var/run/tog-pegasus/socket %dir %attr(1555,root,pegasus) /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
  
Line 426 
Line 446 
 %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(640,root,pegasus) /usr/share/man/man8/*
  
 %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.5/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.5/PegasusSSLGuidelines.htm  %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.5/license.txt  %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.7/license.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
 /usr/%PEGASUS_ARCH_LIB/libDefaultProviderManager.so /usr/%PEGASUS_ARCH_LIB/libDefaultProviderManager.so
 /usr/%PEGASUS_ARCH_LIB/libCIMxmlIndicationHandler.so /usr/%PEGASUS_ARCH_LIB/libCIMxmlIndicationHandler.so
 /usr/%PEGASUS_ARCH_LIB/libCMPIProviderManager.so /usr/%PEGASUS_ARCH_LIB/libCMPIProviderManager.so
   /usr/%PEGASUS_ARCH_LIB/libsnmpIndicationHandler.so
 /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
  
 %files devel %files devel
 %defattr(644,root,pegasus,755) %defattr(644,root,pegasus,755)
 /usr/include/Pegasus  
 /usr/share/Pegasus/samples /usr/share/Pegasus/samples
 /usr/share/doc/tog-pegasus-2.5/*  /usr/share/Pegasus/samples/obj
   /usr/share/Pegasus/samples/lib
   /usr/share/Pegasus/samples/bin
   /usr/include/Pegasus
   /usr/share/doc/tog-pegasus-2.7/*
 /usr/share/Pegasus/html /usr/share/Pegasus/html
 %attr(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/*.so %attr(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/*.so
  

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