pegasus/rpm/tog-pegasus.spec - diff

Return to tog-pegasus.spec CVS log

Up to [Pegasus] / pegasus / rpm

Diff for /pegasus/rpm/tog-pegasus.spec between version 1.76.2.3 and 1.82

version 1.76.2.3, 2006/03/10 14:30:36

version 1.82, 2006/01/24 22:13:02

Line 1

#//%2006////////////////////////////////////////////////////////////////////////

#%2005////////////////////////////////////////////////////////////////////////

#//

#// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.

# Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.

#// IBM Corp.; EMC Corporation, The Open Group.

# IBM Corp.; EMC Corporation, The Open Group.

#// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.

# IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.

#// EMC Corporation; VERITAS Software Corporation; The Open Group.

# EMC Corporation; VERITAS Software Corporation; The Open Group.

#// EMC Corporation; Symantec 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

#// Permission is hereby granted, free of charge, to any person obtaining a copy

# deal in the Software without restriction, including without limitation the

#// of this software and associated documentation files (the "Software"), to

# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or

#// deal in the Software without restriction, including without limitation the

# sell copies of the Software, and to permit persons to whom the Software is

#// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or

# furnished to do so, subject to the following conditions:

#// 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

#// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN

# "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT

#// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED

# LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR

#// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT

# PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

#// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR

# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

#// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

#// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

#// 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

Line 125

Line 123

# End of section pegasus/rpm/tog-specfiles/tog-pegasus-arch.spec

%global PEGASUS_ARCH_LIB %{_lib}

%global OPENSSL_HOME /usr

%global OPENSSL_HOME /usr/include/openssl

%global OPENSSL_BIN /usr/bin

%global PEGASUS_PEM_DIR /etc/Pegasus

%global PEGASUS_SSL_CERT_FILE server.pem

Line 137

Line 135

%global PEGASUS_VARDATA_CACHE_DIR /var/lib/Pegasus/cache

%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 CIMSERVER_LOCK_FILE /var/run/tog-pegasus/cimserver_start.lock

%global PEGASUS_REPOSITORY_DIR /var/lib/Pegasus/repository

%global PEGASUS_PREV_REPOSITORY_DIR_NAME prev_repository

%global PEGASUS_REPOSITORY_PARENT_DIR /var/lib/Pegasus

Line 197

Line 194

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"

%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_CommonProductDirectoriesInclude

make -f $PEGASUS_ROOT/Makefile.Release create_ConfigProductDirectoriesInclude

Line 357

Line 350

[ -d %PEGASUS_VARDATA_CACHE_DIR ] && rm -rf %PEGASUS_VARDATA_CACHE_DIR;

rm -f %PEGASUS_LOCAL_DOMAIN_SOCKET_PATH;

rm -f %PEGASUS_CIMSERVER_START_FILE;

rm -f %CIMSERVER_LOCK_FILE;

# End of section pegasus/rpm/tog-specfiles/tog-pegasus-preun.spec

Legend:

Removed from v.1.76.2.3
changed lines
	Added in v.1.82

No CVS admin address has been configured