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

version 1.85, 2006/02/14 18:33:45 version 1.90.4.7, 2008/02/20 02:35:54
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.6.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 143 
Line 143 
 %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.6
  
 %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 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"
  
   %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
 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 359 
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 384 
Line 402 
  
 %files %files
 %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.6
 %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
Line 398 
Line 416 
 %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(750, root, pegasus) /etc/Pegasus  %dir %attr(755, root, pegasus) /etc/Pegasus
 %dir %attr(1555,root,pegasus) /var/run/tog-pegasus/socket %dir %attr(1555,root,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
  
Line 426 
Line 444 
 %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(640,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.6/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.6/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.6/license.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
Line 441 
Line 459 
  
 %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
   /usr/share/doc/tog-pegasus-2.6/*
 /usr/share/Pegasus/html /usr/share/Pegasus/html
 %attr(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/*.so %attr(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/*.so
  

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