(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.93 and 1.99

version 1.93, 2007/01/23 19:45:27 version 1.99, 2007/09/06 01:28:08
Line 152 
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_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
Line 161 
Line 162 
 %global PEGASUS_DOC_DIR /usr/share/doc/tog-pegasus-2.7 %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 %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 207 
Line 208 
 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"
Line 220 
Line 221 
 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 %{?_smp_mflags} -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
 # #
 # End of section pegasus/rpm/tog-specfiles/tog-pegasus-build.spec # End of section pegasus/rpm/tog-specfiles/tog-pegasus-build.spec
Line 290 
Line 292 
         -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 %CIMSERVER_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
   # 'pegasus' group which are used as the context of the cimservermain process
   if [ $1 -gt 0 ]; then
       /usr/sbin/groupadd pegasus > /dev/null 2>&1 || :;
       /usr/sbin/useradd -c "tog-pegasus OpenPegasus WBEM/CIM services" \
           -g pegasus -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 352 
Line 368 
      # 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
    /etc/init.d/tog-pegasus condrestart     # 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 [ -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 fi
  
 %preun %preun
Line 373 
Line 398 
    [ -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 402 
Line 427 
 # #
 # 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
   # 'pegasus' 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 pegasus > /dev/null 2>&1 || :;
   fi
   
 %files %files
   %defattr(600, cimsrvr, pegasus, 700)
   /var/lib/Pegasus/repository
 %defattr(600, root, pegasus, 755) %defattr(600, root, pegasus, 755)
 %dir /usr/share/doc/tog-pegasus-2.7 %dir /usr/share/doc/tog-pegasus-2.7
 %dir /usr/share/Pegasus %dir /usr/share/Pegasus
Line 414 
Line 448 
 %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 %attr(755, 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, pegasus) /var/run/tog-pegasus
   %dir %attr(1755,cimsrvr,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
  
 %dir %attr(750, root, pegasus) /var/lib/Pegasus/repository  
 /var/lib/Pegasus/repository/*  
 /usr/share/Pegasus/mof/CIM29/* /usr/share/Pegasus/mof/CIM29/*
 /usr/share/Pegasus/mof/Pegasus/* /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, pegasus) /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 438 
Line 470 
 %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
 %attr(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/*.so.1 %attr(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/*.so.1
Line 463 
Line 495 
 %files devel %files devel
 %defattr(644,root,pegasus,755) %defattr(644,root,pegasus,755)
 /usr/share/Pegasus/samples /usr/share/Pegasus/samples
 /usr/share/Pegasus/samples/obj  
 /usr/share/Pegasus/samples/lib  
 /usr/share/Pegasus/samples/bin  
 /usr/include/Pegasus /usr/include/Pegasus
 /usr/share/doc/tog-pegasus-2.7/* /usr/share/doc/tog-pegasus-2.7/*
 /usr/share/Pegasus/html /usr/share/Pegasus/html
Line 475 
Line 504 
 %files test %files test
 %defattr(-,root,pegasus,-) %defattr(-,root,pegasus,-)
 /usr/share/Pegasus/test /usr/share/Pegasus/test
   %defattr(600,cimsrvr, pegasus,700)
 /var/lib/Pegasus/testrepository /var/lib/Pegasus/testrepository
 %endif %endif

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