(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.84 and 1.90

version 1.84, 2006/01/30 16:16:24 version 1.90, 2006/12/11 18:45:03
Line 28 
Line 28 
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #// #//
 #//============================================================================== #//==============================================================================
 #%2005////////////////////////////////////////////////////////////////////////  
 #  
 # Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  
 # Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  
 # Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  
 # IBM Corp.; EMC Corporation, The Open Group.  
 # Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  
 # IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  
 # Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 # EMC Corporation; VERITAS Software Corporation; The Open Group.  
 #  
 # Permission is hereby granted, free of charge, to any person obtaining a copy  
 # of this software and associated documentation files (the "Software"), to  
 # deal in the Software without restriction, including without limitation the  
 # rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  
 # sell copies of the Software, and to permit persons to whom the Software is  
 # furnished to do so, subject to the following conditions:  
 #  
 # THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  
 # ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  
 # "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  
 # LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  
 # PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  
 # HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
 #  
 #==============================================================================  
 #%///////////////////////////////////////////////////////////////////////////// #%/////////////////////////////////////////////////////////////////////////////
 # #
 # tog-pegasus.spec # tog-pegasus.spec
Line 69 
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.0
 Release: 1%{?LINUX_VERSION:.%{LINUX_VERSION}} Release: 1%{?LINUX_VERSION:.%{LINUX_VERSION}}
 Epoch:   1 Epoch:   1
  
Line 153 
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 171 
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 $RPM_BUILD_ROOT/build/tog-pegasus
Line 225 
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
Line 412 
Line 388 
  
 %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 426 
Line 402 
 %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 454 
Line 430 
 %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 469 
Line 445 
  
 %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/share/Pegasus/samples/obj
   /usr/share/Pegasus/samples/lib
   /usr/share/Pegasus/samples/bin
   /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.84  
changed lines
  Added in v.1.90
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2