(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.76 and 1.76.2.3

version 1.76, 2005/12/10 01:58:29 version 1.76.2.3, 2006/03/10 14:30:36
Line 1 
Line 1 
 #%2005////////////////////////////////////////////////////////////////////////  #//%2006////////////////////////////////////////////////////////////////////////
 #  #//
 # Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 # Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
 # Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  #// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;
 # IBM Corp.; EMC Corporation, The Open Group.  #// IBM Corp.; EMC Corporation, The Open Group.
 # Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  #// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
 # IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 # Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;  #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 # EMC Corporation; VERITAS Software Corporation; The Open Group.  #// EMC Corporation; VERITAS Software Corporation; The Open Group.
 #  #// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 # Permission is hereby granted, free of charge, to any person obtaining a copy  #// EMC Corporation; Symantec Corporation; The Open Group.
 # of this software and associated documentation files (the "Software"), to  #//
 # deal in the Software without restriction, including without limitation the  #// Permission is hereby granted, free of charge, to any person obtaining a copy
 # rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  #// of this software and associated documentation files (the "Software"), to
 # sell copies of the Software, and to permit persons to whom the Software is  #// deal in the Software without restriction, including without limitation the
 # furnished to do so, subject to the following conditions:  #// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
 #  #// sell copies of the Software, and to permit persons to whom the Software is
 # THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  #// furnished to do so, subject to the following conditions:
 # ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  #//
 # "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  #// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN
 # LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  #// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED
 # PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  #// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
 # HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  #// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  #// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  #// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
 #  #// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 #==============================================================================  #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   #//
   #//==============================================================================
 #%///////////////////////////////////////////////////////////////////////////// #%/////////////////////////////////////////////////////////////////////////////
 # #
 # tog-pegasus.spec # tog-pegasus.spec
Line 92 
Line 94 
 # #
 # End of section pegasus/rpm/tog-specfiles/tog-pegasus-intro.spec # End of section pegasus/rpm/tog-specfiles/tog-pegasus-intro.spec
  
 %global OPENSSL_HOME /usr/include/openssl  
 %global OPENSSL_BIN /usr/bin  
 %global PEGASUS_PEM_DIR /etc/Pegasus  
 %global PEGASUS_SSL_CERT_FILE server.pem  
 %global PEGASUS_SSL_KEY_FILE file.pem  
 %global PEGASUS_SSL_TRUSTSTORE client.pem  
 %global PAM_CONFIG_DIR /etc/pam.d  
 %global PEGASUS_CONFIG_DIR /etc/Pegasus  
 %global PEGASUS_VARDATA_DIR /var/lib/Pegasus  
 %global PEGASUS_VARDATA_CACHE_DIR /var/lib/Pegasus/cache  
 %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_REPOSITORY_DIR /var/lib/Pegasus/repository  
 %global PEGASUS_PREV_REPOSITORY_DIR_NAME prev_repository  
 %global PEGASUS_REPOSITORY_PARENT_DIR /var/lib/Pegasus  
 %global PEGASUS_PREV_REPOSITORY_DIR /var/lib/Pegasus/prev_repository  
 %global PEGASUS_SBIN_DIR /usr/sbin  
 %global PEGASUS_DOC_DIR /usr/share/doc/tog-pegasus-2.5  
   
 %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_INSTALL_LOG /var/lib/Pegasus/log/install.log  
   
 # Start of section pegasus/rpm/tog-specfiles/tog-pegasus-arch.spec # Start of section pegasus/rpm/tog-specfiles/tog-pegasus-arch.spec
 # #
 %ifarch ia64 %ifarch ia64
Line 145 
Line 124 
 # #
 # End of section pegasus/rpm/tog-specfiles/tog-pegasus-arch.spec # End of section pegasus/rpm/tog-specfiles/tog-pegasus-arch.spec
  
   %global PEGASUS_ARCH_LIB %{_lib}
   %global OPENSSL_HOME /usr
   %global OPENSSL_BIN /usr/bin
   %global PEGASUS_PEM_DIR /etc/Pegasus
   %global PEGASUS_SSL_CERT_FILE server.pem
   %global PEGASUS_SSL_KEY_FILE file.pem
   %global PEGASUS_SSL_TRUSTSTORE client.pem
   %global PAM_CONFIG_DIR /etc/pam.d
   %global PEGASUS_CONFIG_DIR /etc/Pegasus
   %global PEGASUS_VARDATA_DIR /var/lib/Pegasus
   %global PEGASUS_VARDATA_CACHE_DIR /var/lib/Pegasus/cache
   %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 CIMSERVER_LOCK_FILE /var/run/tog-pegasus/cimserver_start.lock
   %global PEGASUS_REPOSITORY_DIR /var/lib/Pegasus/repository
   %global PEGASUS_PREV_REPOSITORY_DIR_NAME prev_repository
   %global PEGASUS_REPOSITORY_PARENT_DIR /var/lib/Pegasus
   %global PEGASUS_PREV_REPOSITORY_DIR /var/lib/Pegasus/prev_repository
   %global PEGASUS_SBIN_DIR /usr/sbin
   %global PEGASUS_DOC_DIR /usr/share/doc/tog-pegasus-2.5
   
   %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_INSTALL_LOG /var/lib/Pegasus/log/install.log
   
 # Start of section pegasus/rpm/tog-specfiles/tog-pegasus-packages.spec # Start of section pegasus/rpm/tog-specfiles/tog-pegasus-packages.spec
 # #
 %package devel %package devel
Line 193 
Line 197 
 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
Line 232 
Line 240 
 %clean %clean
 # Start of section pegasus/rpm/tog-specfiles/tog-pegasus-clean.spec # Start of section pegasus/rpm/tog-specfiles/tog-pegasus-clean.spec
 # #
 #[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT;  [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT;
 #[ "${RPM_BUILD_DIR}" != "/" ] && rm -rf ${RPM_BUILD_DIR}/%{name}-%{version};  [ "${RPM_BUILD_DIR}" != "/" ] && rm -rf ${RPM_BUILD_DIR}/%{name}-%{version};
 # #
 # End of section pegasus/rpm/tog-specfiles/tog-pegasus-clean.spec # End of section pegasus/rpm/tog-specfiles/tog-pegasus-clean.spec
  
Line 260 
Line 268 
    fi    fi
    /bin/mv %PEGASUS_REPOSITORY_DIR %PEGASUS_PREV_REPOSITORY_DIR    /bin/mv %PEGASUS_REPOSITORY_DIR %PEGASUS_PREV_REPOSITORY_DIR
 fi fi
 if [ $1 -eq 1 ]; 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 "tog-pegasus OpenPegasus WBEM/CIM services" \
Line 281 
Line 289 
  
    # Create Symbolic Links for SDK Libraries    # Create Symbolic Links for SDK Libraries
    #    #
    ln -sf libpegclient.so.1 /usr/lib/libpegclient.so     ln -sf libpegclient.so.1 /usr/%PEGASUS_ARCH_LIB/libpegclient.so
    ln -sf libpegcommon.so.1 /usr/lib/libpegcommon.so     ln -sf libpegcommon.so.1 /usr/%PEGASUS_ARCH_LIB/libpegcommon.so
    ln -sf libpegprovider.so.1 /usr/lib/libpegprovider.so     ln -sf libpegprovider.so.1 /usr/%PEGASUS_ARCH_LIB/libpegprovider.so
    ln -sf libDefaultProviderManager.so.1 /usr/lib/libDefaultProviderManager.so     ln -sf libDefaultProviderManager.so.1 /usr/%PEGASUS_ARCH_LIB/libDefaultProviderManager.so
    ln -sf libCIMxmlIndicationHandler.so.1 /usr/lib/libCIMxmlIndicationHandler.so     ln -sf libCIMxmlIndicationHandler.so.1 /usr/%PEGASUS_ARCH_LIB/libCIMxmlIndicationHandler.so
    ln -sf libCMPIProviderManager.so.1 /usr/lib/libCMPIProviderManager.so     ln -sf libCMPIProviderManager.so.1 /usr/%PEGASUS_ARCH_LIB/libCMPIProviderManager.so
  
    # Create Symbolic Links for Packaged Provider Libraries    # Create Symbolic Links for Packaged Provider Libraries
    #    #
    ln -sf libComputerSystemProvider.so.1 /usr/lib/Pegasus/providers/libComputerSystemProvider.so     ln -sf libComputerSystemProvider.so.1 /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libComputerSystemProvider.so
    ln -sf libOSProvider.so.1 /usr/lib/Pegasus/providers/libOSProvider.so     ln -sf libOSProvider.so.1 /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libOSProvider.so
    ln -sf libProcessProvider.so.1 /usr/lib/Pegasus/providers/libProcessProvider.so     ln -sf libProcessProvider.so.1 /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libProcessProvider.so
  
  
 # Start of section pegasus/rpm/tog-specfiles/tog-pegasus-post.spec # Start of section pegasus/rpm/tog-specfiles/tog-pegasus-post.spec
Line 300 
Line 308 
 #           install   remove   upgrade  reinstall #           install   remove   upgrade  reinstall
 # %post        1        -         2         2 # %post        1        -         2         2
 # #
      export PEGASUS_ARCH_LIB=%PEGASUS_ARCH_LIB
   
    if [ -d %PEGASUS_PREV_REPOSITORY_DIR ]; then    if [ -d %PEGASUS_PREV_REPOSITORY_DIR ]; then
        # Running Repository Upgrade utility        # Running Repository Upgrade utility
        %PEGASUS_SBIN_DIR/repupgrade %PEGASUS_PREV_REPOSITORY_DIR \        %PEGASUS_SBIN_DIR/repupgrade %PEGASUS_PREV_REPOSITORY_DIR \
Line 315 
Line 325 
 %endif %endif
    :;    :;
    elif [ $1 -gt 0 ]; then    elif [ $1 -gt 0 ]; then
        /sbin/service tog-pegasus condrestart         /etc/init.d/tog-pegasus condrestart
    :;    :;
    fi    fi
 # #
Line 326 
Line 336 
      # Running Repository Upgrade utility      # Running Repository Upgrade utility
      %PEGASUS_SBIN_DIR/repupgrade 2>>%PEGASUS_INSTALL_LOG      %PEGASUS_SBIN_DIR/repupgrade 2>>%PEGASUS_INSTALL_LOG
    fi    fi
    /sbin/service tog-pegasus condrestart     /etc/init.d/tog-pegasus condrestart
    :;    :;
 fi fi
  
Line 347 
Line 357 
    [ -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;
 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 370 
Line 381 
 #  postun      -        0         1         - #  postun      -        0         1         -
 if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
    /usr/sbin/userdel pegasus > /dev/null 2>&1 || :;    /usr/sbin/userdel pegasus > /dev/null 2>&1 || :;
    /usr/sbin/groudel pegasus > /dev/null 2>&1 || :;     /usr/sbin/groupdel pegasus > /dev/null 2>&1 || :;
 fi; fi;
 # #
 # End of section pegasus/rpm/tog-specfiles/tog-pegasus-postun.spec # End of section pegasus/rpm/tog-specfiles/tog-pegasus-postun.spec
Line 378 
Line 389 
 %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.5
 %dir /usr/lib/Pegasus  
 %dir /usr/lib/Pegasus/providers  
 %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 390 
Line 399 
 %dir /var/lib/Pegasus/log %dir /var/lib/Pegasus/log
 %dir /var/lib/Pegasus/cache/localauth %dir /var/lib/Pegasus/cache/localauth
 %dir /var/run/tog-pegasus %dir /var/run/tog-pegasus
   %dir /usr/%PEGASUS_ARCH_LIB/Pegasus
   %dir /usr/%PEGASUS_ARCH_LIB/Pegasus/providers
  
 %dir %attr(750, root, pegasus) /etc/Pegasus %dir %attr(750, root, pegasus) /etc/Pegasus
 %dir %attr(1555,root,pegasus) /var/run/tog-pegasus/socket %dir %attr(1555,root,pegasus) /var/run/tog-pegasus/socket
Line 413 
Line 424 
  
 %attr(750,root,pegasus) /usr/sbin/* %attr(750,root,pegasus) /usr/sbin/*
 %attr(755,root,pegasus) /usr/bin/* %attr(755,root,pegasus) /usr/bin/*
 %attr(755,root,pegasus) /usr/lib/*.so.1  %attr(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/*.so.1
 %attr(755,root,pegasus) /usr/lib/Pegasus/providers/*.so.1  %attr(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/*.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(640,root,pegasus) /usr/share/man/man8/* %attr(640,root,pegasus) /usr/share/man/man8/*
Line 422 
Line 433 
 %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.5/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.5/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.5/license.txt
 /usr/lib/libpegclient.so  /usr/%PEGASUS_ARCH_LIB/libpegclient.so
 /usr/lib/libpegcommon.so  /usr/%PEGASUS_ARCH_LIB/libpegcommon.so
 /usr/lib/libpegprovider.so  /usr/%PEGASUS_ARCH_LIB/libpegprovider.so
 /usr/lib/libDefaultProviderManager.so  /usr/%PEGASUS_ARCH_LIB/libDefaultProviderManager.so
 /usr/lib/libCIMxmlIndicationHandler.so  /usr/%PEGASUS_ARCH_LIB/libCIMxmlIndicationHandler.so
 /usr/lib/libCMPIProviderManager.so  /usr/%PEGASUS_ARCH_LIB/libCMPIProviderManager.so
 /usr/lib/Pegasus/providers/libComputerSystemProvider.so  /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libComputerSystemProvider.so
 /usr/lib/Pegasus/providers/libOSProvider.so  /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libOSProvider.so
 /usr/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  /usr/include/Pegasus
 /usr/share/Pegasus/samples /usr/share/Pegasus/samples
 /usr/share/doc/tog-pegasus-2.5/* /usr/share/doc/tog-pegasus-2.5/*
 /usr/share/Pegasus/html /usr/share/Pegasus/html
 %attr(755,root,pegasus) /usr/lib/Pegasus/providers/*.so  %attr(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/*.so
  
 %if %{PEGASUS_BUILD_TEST_RPM} %if %{PEGASUS_BUILD_TEST_RPM}
 %files test %files test

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