(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.83 and 1.139.2.2

version 1.83, 2006/01/25 21:51:25 version 1.139.2.2, 2015/04/02 12:20:37
Line 1 
Line 1 
 #%2005////////////////////////////////////////////////////////////////////////  #//%LICENSE////////////////////////////////////////////////////////////////
 #  #//
 # Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  #// Licensed to The Open Group (TOG) under one or more contributor license
 # Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  #// agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 # Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  #// this work for additional information regarding copyright ownership.
 # IBM Corp.; EMC Corporation, The Open Group.  #// Each contributor licenses this file to you under the OpenPegasus Open
 # Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  #// Source License; you may not use this file except in compliance with the
 # IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  #// License.
 # Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;  #//
 # EMC Corporation; VERITAS Software Corporation; The Open Group.  #// Permission is hereby granted, free of charge, to any person obtaining a
 #  #// copy of this software and associated documentation files (the "Software"),
 # Permission is hereby granted, free of charge, to any person obtaining a copy  #// to deal in the Software without restriction, including without limitation
 # of this software and associated documentation files (the "Software"), to  #// the rights to use, copy, modify, merge, publish, distribute, sublicense,
 # deal in the Software without restriction, including without limitation the  #// and/or sell copies of the Software, and to permit persons to whom the
 # rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  #// Software is furnished to do so, subject to the following conditions:
 # sell copies of the Software, and to permit persons to whom the Software is  #//
 # furnished to do so, subject to the following conditions:  #// The above copyright notice and this permission notice shall be included
 #  #// in all copies or substantial portions of the Software.
 # THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  #//
 # ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  #// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  #// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  #// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 # PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  #// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 # HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  #// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  #// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  #// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #  #//
 #==============================================================================  #//////////////////////////////////////////////////////////////////////////
 #%///////////////////////////////////////////////////////////////////////////// #%/////////////////////////////////////////////////////////////////////////////
 # #
 # tog-pegasus.spec # tog-pegasus.spec
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.
 # #
  
 Version: 2.5RC1  %define Flavor  tog
 Release: 1%{?LINUX_VERSION:.%{LINUX_VERSION}}  %define packageVersion 1
   Version: 2.14.2
   Release: %{packageVersion}%{?LINUX_VERSION:.%{LINUX_VERSION}}
 Epoch:   1 Epoch:   1
  
 # Start of section pegasus/rpm/tog-specfiles/tog-pegasus-intro.spec # Start of section pegasus/rpm/tog-specfiles/tog-pegasus-intro.spec
Line 52 
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}
   
   # Use "rpmbuild --define 'PEGASUS_32BIT_PROVIDER_SUPPORT 1'" to build 32 bit
   # providers for 64 bit CIMOM.
   %{?!PEGASUS_32BIT_PROVIDER_SUPPORT: %define PEGASUS_32BIT_PROVIDER_SUPPORT 0}
   
   # Use "rpmbuild --define 'PEGASUS_BUILD_WITH_CLANG 1'" to build rpm with clang.
   # This shrinks disk usage by around 4%
   %{?!PEGASUS_BUILD_WITH_CLANG: %define PEGASUS_BUILD_WITH_CLANG 0}
  
 %define srcRelease 1  
 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
 URL:       http://www.openpegasus.org URL:       http://www.openpegasus.org
  
 Source:    %{name}-%{version}-%{srcRelease}.tar.gz  Source:    %{name}-%{version}-%{packageVersion}.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
   
   #Following is commented because, Currently could not find clang shipped
   #Should be changed or uncommented when distros ship clang
   #and expects that system has clang 3 and above installed by other means
   #%if %{PEGASUS_BUILD_WITH_CLANG}
   #BuildRequires:      clang
   #%endif
   
   %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, openslp-devel
   Requires:           openslp
   %endif
   
   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, chkconfig, SysVinit, bind-libs
 Requires:           e2fsprogs, bind-utils, net-tools Requires:           e2fsprogs, bind-utils, net-tools
 Requires(post):     bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam Requires(post):     bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam
 #Requires(post):    krb5-libs, redhat-lsb, chkconfig, SysVinit, bind-libs  #Requires(post):    krb5-libs, chkconfig, SysVinit, bind-libs
 Requires(post):     e2fsprogs, bind-utils, net-tools Requires(post):     e2fsprogs, bind-utils, net-tools
 Requires(pre):      bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam Requires(pre):      bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam
 #Requires(pre):     krb5-libs, redhat-lsb, chkconfig, SysVinit, bind-libs  #Requires(pre):     krb5-libs, chkconfig, SysVinit, bind-libs
 Requires(pre):      e2fsprogs, bind-utils, net-tools Requires(pre):      e2fsprogs, bind-utils, net-tools
 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, 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: %{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 90 
Line 136 
 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 98 
Line 144 
 %global PEGASUS_HARDWARE_PLATFORM LINUX_IA64_GNU %global PEGASUS_HARDWARE_PLATFORM LINUX_IA64_GNU
 %else %else
 %ifarch x86_64 %ifarch x86_64
   %if %{PEGASUS_BUILD_WITH_CLANG}
   %global PEGASUS_HARDWARE_PLATFORM LINUX_X86_64_CLANG
   %else
 %global PEGASUS_HARDWARE_PLATFORM LINUX_X86_64_GNU %global PEGASUS_HARDWARE_PLATFORM LINUX_X86_64_GNU
   %endif
 %else %else
 %ifarch ppc %ifarch ppc
 %global PEGASUS_HARDWARE_PLATFORM LINUX_PPC_GNU %global PEGASUS_HARDWARE_PLATFORM LINUX_PPC_GNU
Line 112 
Line 162 
 %ifarch s390x zseries %ifarch s390x zseries
 %global PEGASUS_HARDWARE_PLATFORM LINUX_ZSERIES64_GNU %global PEGASUS_HARDWARE_PLATFORM LINUX_ZSERIES64_GNU
 %else %else
   %if %{PEGASUS_BUILD_WITH_CLANG}
   %global PEGASUS_HARDWARE_PLATFORM LINUX_IX86_CLANG
   %else
 %global PEGASUS_HARDWARE_PLATFORM LINUX_IX86_GNU %global PEGASUS_HARDWARE_PLATFORM LINUX_IX86_GNU
 %endif %endif
 %endif %endif
Line 119 
Line 172 
 %endif %endif
 %endif %endif
 %endif %endif
   %endif
 # #
 # End of section pegasus/rpm/tog-specfiles/tog-pegasus-arch.spec # End of section pegasus/rpm/tog-specfiles/tog-pegasus-arch.spec
  
   # Start of section pegasus/rpm/tog-specfiles/tog-pegasus-arch-for-32bit-provider-support.spec
   # This is required only when PEGASUS_32BIT_PROVIDER_SUPPORT is set
   
   %if %{PEGASUS_32BIT_PROVIDER_SUPPORT}
   
   %ifarch x86_64
   
   %if %{PEGASUS_BUILD_WITH_CLANG}
   %global PEGASUS_HARDWARE_PLATFORM_FOR_32BIT LINUX_IX86_CLANG
   %global PEGASUS_EXTRA_CXX_FLAGS_32BIT  "-O2 -g -pipe -fexceptions -fstack-protector -march=i386 -mtune=generic -fasynchronous-unwind-tables -m32"
   % global PEGASUS_EXTRA_LINK_FLAGS_32BIT "-O2 -g -pipe -fexceptions -fstack-protector -march=i386 -mtune=generic -fasynchronous-unwind-tables -m32"
   %else
   %global PEGASUS_HARDWARE_PLATFORM_FOR_32BIT LINUX_IX86_GNU
   %global PEGASUS_EXTRA_CXX_FLAGS_32BIT  "-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -march=i386 -mtune=generic -fasynchronous-unwind-tables -Wno-unused -m32"
   %global PEGASUS_EXTRA_LINK_FLAGS_32BIT "-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -march=i386 -mtune=generic -fasynchronous-unwind-tables -m32"
   %endif
   %else
   %ifarch ppc64 pseries
   %global PEGASUS_HARDWARE_PLATFORM_FOR_32BIT LINUX_PPC_GNU
   %global PEGASUS_EXTRA_CXX_FLAGS_32BIT  "-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2 -m32 -Wno-unused"
   %global PEGASUS_EXTRA_LINK_FLAGS_32BIT "-O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -m32"
   %else
   %ifarch s390x zseries
   %global PEGASUS_HARDWARE_PLATFORM_FOR_32BIT LINUX_ZSERIES_GNU
   %global PEGASUS_EXTRA_CXX_FLAGS_32BIT  "-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m31 -Wno-unused"
   %global PEGASUS_EXTRA_LINK_FLAGS_32BIT "-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m31"
   %endif
   %endif
   %endif
   
   %endif
   
   #
   # End of section pegasus/rpm/tog-specfiles/tog-pegasus-arch-for-32bit-provider-support.spec
   
 %global PEGASUS_ARCH_LIB %{_lib} %global PEGASUS_ARCH_LIB %{_lib}
 %global OPENSSL_HOME /usr/include/openssl  %global OPENSSL_HOME /usr
 %global OPENSSL_BIN /usr/bin %global OPENSSL_BIN /usr/bin
 %global PEGASUS_PEM_DIR /etc/Pegasus %global PEGASUS_PEM_DIR /etc/Pegasus
 %global PEGASUS_SSL_CERT_FILE server.pem %global PEGASUS_SSL_CERT_FILE server.pem
Line 135 
Line 224 
 %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_TRACE_FILE_PATH /var/lib/Pegasus/cache/trace/cimserver.trc
   %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.14
  
 %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 %PEGASUS_RPM_ROOT/build
 %global PEGASUS_INSTALL_LOG /var/lib/Pegasus/log/install.log %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
Line 152 
Line 242 
 %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  Requires(preun): bash, procps, grep, coreutils, make
   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 165 
Line 256 
 %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 190 
Line 281 
 export LD_LIBRARY_PATH=$PEGASUS_HOME/lib export LD_LIBRARY_PATH=$PEGASUS_HOME/lib
 export PATH=$PEGASUS_HOME/bin:$PATH export PATH=$PEGASUS_HOME/bin:$PATH
  
 export PEGASUS_EXTRA_C_FLAGS="$RPM_OPT_FLAGS -g"  export PEGASUS_EXTRA_C_FLAGS="$RPM_OPT_FLAGS -g -Wno-unused"
 export PEGASUS_EXTRA_CXX_FLAGS="$PEGASUS_EXTRA_C_FLAGS" export PEGASUS_EXTRA_CXX_FLAGS="$PEGASUS_EXTRA_C_FLAGS"
 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_TMP=/usr/share/Pegasus/test/tmp
   export PEGASUS_DISPLAYCONSUMER_DIR="$PEGASUS_TMP"
   %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
   
   %if %{PEGASUS_32BIT_PROVIDER_SUPPORT}
   sed -i 's/#PEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT=.*$/PEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT=%PEGASUS_HARDWARE_PLATFORM_FOR_32BIT/' $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
 make -f $PEGASUS_ROOT/Makefile.Release all  make %{?_smp_mflags} -f $PEGASUS_ROOT/Makefile.Release all
   chmod 777 %PEGASUS_RPM_HOME
 make -f $PEGASUS_ROOT/Makefile.Release repository make -f $PEGASUS_ROOT/Makefile.Release repository
   
   %if %{PEGASUS_32BIT_PROVIDER_SUPPORT}
   
   export PEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT=%PEGASUS_HARDWARE_PLATFORM_FOR_32BIT
   export PEGASUS_EXTRA_C_FLAGS=%PEGASUS_EXTRA_CXX_FLAGS_32BIT
   export PEGASUS_EXTRA_CXX_FLAGS="$PEGASUS_EXTRA_C_FLAGS"
   export PEGASUS_EXTRA_LINK_FLAGS=%PEGASUS_EXTRA_LINK_FLAGS_32BIT
   
   make %{?_smp_mflags} -f $PEGASUS_ROOT/Makefile.cimprovagt32 all
   
   %endif
   
 # #
 # End of section pegasus/rpm/tog-specfiles/tog-pegasus-build.spec # End of section pegasus/rpm/tog-specfiles/tog-pegasus-build.spec
  
Line 227 
Line 352 
     PEGASUS_STAGING_DIR=$PEGASUS_STAGING_DIR     PEGASUS_STAGING_DIR=$PEGASUS_STAGING_DIR
 %endif %endif
  
   %if %{PEGASUS_32BIT_PROVIDER_SUPPORT}
   export PEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT=%PEGASUS_HARDWARE_PLATFORM_FOR_32BIT
   export LD_LIBRARY_PATH=$PEGASUS_HOME/lib32
   make -f $PEGASUS_ROOT/Makefile.cimprovagt32 stage \
       PEGASUS_STAGING_DIR=$PEGASUS_STAGING_DIR
   
   %endif
   
 [ "$PEGASUS_HOME" != "/" ] && [ -d $PEGASUS_HOME ] && rm -rf $PEGASUS_HOME; [ "$PEGASUS_HOME" != "/" ] && [ -d $PEGASUS_HOME ] && rm -rf $PEGASUS_HOME;
 # #
 # End of section pegasus/rpm/tog-specfiles/tog-pegasus-install.spec # End of section pegasus/rpm/tog-specfiles/tog-pegasus-install.spec
Line 265 
Line 398 
 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
   if [ $1 -eq 2 ]; then
       rm -f %PEGASUS_LOCAL_DOMAIN_SOCKET_PATH;
       rm -f %PEGASUS_CIMSERVER_START_FILE;
       rm -f %PEGASUS_CIMSERVER_START_LOCK_FILE;
   fi
 # #
 # End of section pegasus/rpm/tog-specfiles/tog-pegasus-pre.spec # End of section pegasus/rpm/tog-specfiles/tog-pegasus-pre.spec
  
   # When Privilege Separation is enabled, create the 'cimsrvr' user and
   # 'cimsrvr' group which are used as the context of the cimservermain process
   if [ $1 -gt 0 ]; then
       /usr/sbin/groupadd cimsrvr > /dev/null 2>&1 || :;
       /usr/sbin/useradd -c "tog-pegasus OpenPegasus WBEM/CIM services" \
           -g cimsrvr -s /sbin/nologin -r -d %PEGASUS_VARDATA_DIR cimsrvr \
           > /dev/null 2>&1 || :;
   fi
   
 %post %post
 if [ $1 -eq 1 ]; then if [ $1 -eq 1 ]; then
    echo `date` > %PEGASUS_INSTALL_LOG 2>&1    echo `date` > %PEGASUS_INSTALL_LOG 2>&1
Line 288 
Line 435 
    ln -sf libpegprovider.so.1 /usr/%PEGASUS_ARCH_LIB/libpegprovider.so    ln -sf libpegprovider.so.1 /usr/%PEGASUS_ARCH_LIB/libpegprovider.so
    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 libsnmpIndicationHandler.so.1 /usr/%PEGASUS_ARCH_LIB/libsnmpIndicationHandler.so
  
    # Create Symbolic Links for Packaged Provider Libraries    # Create Symbolic Links for Packaged Provider Libraries
    #    #
Line 296 
Line 443 
    ln -sf libOSProvider.so.1 /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libOSProvider.so    ln -sf libOSProvider.so.1 /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libOSProvider.so
    ln -sf libProcessProvider.so.1 /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libProcessProvider.so    ln -sf libProcessProvider.so.1 /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libProcessProvider.so
  
      # Create Symbolic Links for Packaged Provider Managers
      #
      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 304 
Line 461 
 # #
    export PEGASUS_ARCH_LIB=%PEGASUS_ARCH_LIB    export PEGASUS_ARCH_LIB=%PEGASUS_ARCH_LIB
  
    if [ -d %PEGASUS_PREV_REPOSITORY_DIR ]; then  
        # Running Repository Upgrade utility  
        %PEGASUS_SBIN_DIR/repupgrade %PEGASUS_PREV_REPOSITORY_DIR \  
            %PEGASUS_REPOSITORY_DIR 2>>%PEGASUS_INSTALL_LOG  
        /bin/tar -C %PEGASUS_REPOSITORY_PARENT_DIR -cf \  
            %PEGASUS_PREV_REPOSITORY_DIR`date '+%Y-%m-%d-%s.%N'`.tar \  
            %PEGASUS_PREV_REPOSITORY_DIR_NAME  
        rm -rf %PEGASUS_PREV_REPOSITORY_DIR  
    fi  
    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
 # #
 # End of section pegasus/rpm/tog-specfiles/tog-pegasus-post.spec # End of section pegasus/rpm/tog-specfiles/tog-pegasus-post.spec
  
 elif [ $1 -gt 1 ]; then elif [ $1 -gt 1 ]; then
      # Check if the cimserver is running
      isRunning=`ps -el | grep cimserver | grep -v "grep cimserver"`
      if [ "$isRunning" ]; then
          /etc/init.d/tog-pegasus stop
      fi
    if [ -d %PEGASUS_PREV_REPOSITORY_DIR ]; then    if [ -d %PEGASUS_PREV_REPOSITORY_DIR ]; then
      # Running Repository Upgrade utility         # The old repository was moved to /var/lib/Pegasus/prev_repository. It should now be upgraded to the new repository /var/lib/Pegasus/repository.
      %PEGASUS_SBIN_DIR/repupgrade 2>>%PEGASUS_INSTALL_LOG         %PEGASUS_SBIN_DIR/repupgrade >> %PEGASUS_INSTALL_LOG 2>&1
          chown -R cimsrvr %PEGASUS_REPOSITORY_DIR
          chgrp -R cimsrvr %PEGASUS_REPOSITORY_DIR
      fi
      if [ -f %PEGASUS_TRACE_FILE_PATH ]; then
        /bin/mv %PEGASUS_TRACE_FILE_PATH %PEGASUS_TRACE_FILE_PATH-`date '+%Y-%m-%d-%R'`
      fi
      if [ "$isRunning" ]; then
          /etc/init.d/tog-pegasus start
    fi    fi
    /etc/init.d/tog-pegasus condrestart  
    :;  
 fi fi
  
 %preun %preun
Line 344 
Line 503 
    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;
    rm -f %PEGASUS_INSTALL_LOG;  
    [ -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;
    rm -f %PEGASUS_CIMSERVER_START_FILE;    rm -f %PEGASUS_CIMSERVER_START_FILE;
    rm -f %CIMSERVER_LOCK_FILE;     rm -f %PEGASUS_CIMSERVER_START_LOCK_FILE;
      rm -f %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_CERT_FILE
      rm -f %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_KEY_FILE
      rm -f %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_TRUSTSTORE
      rm -f %PEGASUS_CONFIG_DIR/ssl.cnf
 fi fi
 # #
 # End of section pegasus/rpm/tog-specfiles/tog-pegasus-preun.spec # End of section pegasus/rpm/tog-specfiles/tog-pegasus-preun.spec
  
 %preun devel %preun devel
   # Check if the SDK has been setup
   if [ -f /usr/share/Pegasus/samples/SDKIsSetup ]; then
      make --directory /usr/share/Pegasus/samples -s unsetupSDK
      if [ $? != 0 ]; then
         echo "++++++++++++++++++++++++++++++++++++++++++++++" >&2
         echo "ERROR: Failed to deregister sample providers." >&2
         echo "To remove the SDK rpm without deregistering" >&2
         echo "the sample providers, first remove file" >&2
         echo "/usr/share/Pegasus/samples/SDKIsSetup," >&2
         echo "then remove SDK rpm." >&2
         echo "++++++++++++++++++++++++++++++++++++++++++++++" >&2
         exit 1
      fi
   fi
 make --directory /usr/share/Pegasus/samples -s clean make --directory /usr/share/Pegasus/samples -s clean
  
 %if %{PEGASUS_BUILD_TEST_RPM} %if %{PEGASUS_BUILD_TEST_RPM}
Line 380 
Line 556 
 # #
 # End of section pegasus/rpm/tog-specfiles/tog-pegasus-postun.spec # End of section pegasus/rpm/tog-specfiles/tog-pegasus-postun.spec
  
   # When Privilege Separation is enabled, delete the 'cimsrvr' user and
   # 'cimsrvr' group which are used as the context of the cimservermain process
   if [ $1 -eq 0 ]; then
       /usr/sbin/userdel cimsrvr > /dev/null 2>&1 || :;
       /usr/sbin/groupdel cimsrvr > /dev/null 2>&1 || :;
   fi
   
 %files %files
   %defattr(600,cimsrvr,cimsrvr,700)
   /var/lib/Pegasus/repository
   
   %defattr(644,root,pegasus,755)
   /usr/share/Pegasus/mof
   
 %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.14
 %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/CIM29  
 %dir /usr/share/Pegasus/mof/Pegasus  
 %dir /var/lib/Pegasus %dir /var/lib/Pegasus
 %dir /var/lib/Pegasus/cache %dir /var/lib/Pegasus/cache
 %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 /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 /usr/%PEGASUS_ARCH_LIB/Pegasus/providerManagers
  
 %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(755,cimsrvr,cimsrvr) /var/run/tog-pegasus
 %dir %attr(1777,root,pegasus) /var/lib/Pegasus/cache/trace  %dir %attr(1755,cimsrvr,cimsrvr) /var/run/tog-pegasus/socket
   %dir %attr(1777,cimsrvr,cimsrvr) /var/lib/Pegasus/cache/trace
 %dir %attr(750, root, pegasus) /var/lib/Pegasus/repository  
 /var/lib/Pegasus/repository/*  
 /usr/share/Pegasus/mof/CIM29/*  
 /usr/share/Pegasus/mof/Pegasus/*  
  
 %config %attr(750,root,pegasus) /etc/init.d/tog-pegasus %config %attr(750,root,pegasus) /etc/init.d/tog-pegasus
 %config(noreplace) /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 416 
Line 598 
 %ghost %config(noreplace) /etc/Pegasus/file.pem %ghost %config(noreplace) /etc/Pegasus/file.pem
 %ghost /var/lib/Pegasus/log/install.log %ghost /var/lib/Pegasus/log/install.log
  
 %attr(750,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
   %if %{PEGASUS_32BIT_PROVIDER_SUPPORT}
   %dir /usr/lib/Pegasus
   %dir /usr/lib/Pegasus/providers
   %dir /usr/lib/Pegasus/providerManagers
   %attr(755,root,pegasus) /usr/lib/*.so.1
   %attr(755,root,pegasus) /usr/lib/Pegasus/providerManagers/*.so.1
   /usr/lib/libpegclient.so
   /usr/lib/libpegcommon.so
   /usr/lib/libpegprovider.so
   /usr/lib/libDefaultProviderManager.so
   /usr/lib/Pegasus/providerManagers/libCMPIProviderManager.so
   %endif
 %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(644,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.14/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.14/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.14/license.txt
   %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.14/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
 /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/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
    %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
  
 %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/include/Pegasus
   %doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.14/SecurityGuidelinesForDevelopers.html
 /usr/share/Pegasus/html /usr/share/Pegasus/html
 %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
 %defattr(-,root,pegasus,-) %defattr(-,root,pegasus,-)
 /usr/share/Pegasus/test  
   %dir /usr/share/Pegasus/test
   %dir /usr/share/Pegasus/test/bin
   %dir /usr/share/Pegasus/test/%PEGASUS_ARCH_LIB
   %dir /usr/share/Pegasus/test/mak
   %dir /usr/share/Pegasus/test/tmp
   
   %ghost /usr/share/Pegasus/test/tmp/procIdFile
   %ghost /usr/share/Pegasus/test/tmp/trapLogFile
   %ghost /usr/share/Pegasus/test/tmp/IndicationStressTestLog
   %ghost /usr/share/Pegasus/test/tmp/oldIndicationStressTestLog
   
   %attr(744,root,pegasus) /usr/share/Pegasus/test/bin/*
   %attr(744,root,pegasus) /usr/share/Pegasus/test/%PEGASUS_ARCH_LIB/*
   %attr(744,root,pegasus) /usr/share/Pegasus/test/mak/*
   %attr(644,root,pegasus) /usr/share/Pegasus/test/Makefile
   
   %defattr(600,cimsrvr, cimsrvr,700)
 /var/lib/Pegasus/testrepository /var/lib/Pegasus/testrepository
 %endif %endif

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