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.81 and 1.88

version 1.81, 2006/01/24 19:28:52

version 1.88, 2006/08/23 19:53:13

Line 1

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

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

#//

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

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

#// EMC Corporation; Symantec Corporation; The Open Group.

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

#//

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

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

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

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

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

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

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

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

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

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

# 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

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

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

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

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

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

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

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

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

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

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

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

Line 39

Line 41

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

Epoch: 1

Line 123

Line 125

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

%global PEGASUS_ARCH_LIB %{_lib}

%global OPENSSL_HOME /usr/include/openssl

%global OPENSSL_HOME /usr

%global OPENSSL_BIN /usr/bin

%global PEGASUS_PEM_DIR /etc/Pegasus

%global PEGASUS_SSL_CERT_FILE server.pem

Line 135

Line 137

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

Line 197

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 261

Line 268

/bin/mv %PEGASUS_REPOSITORY_DIR %PEGASUS_PREV_REPOSITORY_DIR

if [ $1 -eq 1 ]; then

if [ $1 -gt 0 ]; then

# Create the 'pegasus' user and group:

/usr/sbin/groupadd pegasus > /dev/null 2>&1 || :;

/usr/sbin/useradd -c "tog-pegasus OpenPegasus WBEM/CIM services" \

Line 350

Line 357

[ -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.81
changed lines
	Added in v.1.88

No CVS admin address has been configured