(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.90 and 1.90.4.6

version 1.90, 2006/12/11 18:45:03 version 1.90.4.6, 2007/10/19 17:29:09
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.6.0  Version: 2.6.2
 Release: 1%{?LINUX_VERSION:.%{LINUX_VERSION}} Release: 1%{?LINUX_VERSION:.%{LINUX_VERSION}}
 Epoch:   1 Epoch:   1
  
Line 192 
Line 192 
 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 204 
Line 204 
 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 363 
Line 363 
 # 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 446 
Line 460 
 %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.6/* /usr/share/doc/tog-pegasus-2.6/*
 /usr/share/Pegasus/html /usr/share/Pegasus/html


Legend:
Removed from v.1.90  
changed lines
  Added in v.1.90.4.6

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2