(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.97

version 1.93, 2007/01/23 19:45:27 version 1.97, 2007/07/31 21:44:49
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_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 161 
 %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 207 
 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 373 
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 463 
Line 463 
 %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

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