(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.85 and 1.85.2.4

version 1.85, 2006/02/14 18:33:45 version 1.85.2.4, 2006/07/07 21:33:04
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.5RC1  Version: 2.5.2
 Release: 1%{?LINUX_VERSION:.%{LINUX_VERSION}} Release: 1%{?LINUX_VERSION:.%{LINUX_VERSION}}
 Epoch:   1 Epoch:   1
  
Line 125 
Line 125 
 # 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 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 197 
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


Legend:
Removed from v.1.85  
changed lines
  Added in v.1.85.2.4

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2