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.101 and 1.110.4.1

version 1.101, 2007/09/11 18:57:45

version 1.110.4.1, 2008/07/01 15:17:30

Line 41

# be lost the next time this file is regenerated and submitted to CVS.

Version: 2.7.0

%define packageVersion 1

Release: 1%{?LINUX_VERSION:.%{LINUX_VERSION}}

Version: 2.8.0

Release: %{packageVersion}%{?LINUX_VERSION:.%{LINUX_VERSION}}

Epoch: 1

# Start of section pegasus/rpm/tog-specfiles/tog-pegasus-intro.spec

Line 55

Line 56

# (chkconfig --level=345 tog-pegasus on) after installation.

%define srcRelease 1

Summary: OpenPegasus WBEM Services for Linux

Name: tog-pegasus

Group: Systems Management/Base

Line 63

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root

URL: http://www.openpegasus.org

Source: %{name}-%{version}-%{srcRelease}.tar.gz

Source: %{name}-%{version}-%{packageVersion}.tar.gz

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

Line 159

%global PEGASUS_REPOSITORY_PARENT_DIR /var/lib/Pegasus

%global PEGASUS_PREV_REPOSITORY_DIR /var/lib/Pegasus/prev_repository

%global PEGASUS_SBIN_DIR /usr/sbin

%global PEGASUS_DOC_DIR /usr/share/doc/tog-pegasus-2.7

%global PEGASUS_DOC_DIR /usr/share/doc/tog-pegasus-2.8

%global PEGASUS_RPM_ROOT $RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION

%global PEGASUS_RPM_HOME %PEGASUS_RPM_ROOT/build

Line 214

#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

export PEGASUS_TMP=/usr/share/Pegasus/test/tmp

export PEGASUS_DISPLAYCONSUMER_DIR="$PEGASUS_TMP"

%endif

make -f $PEGASUS_ROOT/Makefile.Release create_ProductVersionFile

Line 295

Line 296

if [ $1 -eq 2 ]; then

rm -f %PEGASUS_LOCAL_DOMAIN_SOCKET_PATH;

rm -f %PEGASUS_CIMSERVER_START_FILE;

rm -f %CIMSERVER_LOCK_FILE;

rm -f %PEGASUS_CIMSERVER_START_LOCK_FILE;

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

Line 325

Line 326

ln -sf libpegprovider.so.1 /usr/%PEGASUS_ARCH_LIB/libpegprovider.so

ln -sf libDefaultProviderManager.so.1 /usr/%PEGASUS_ARCH_LIB/libDefaultProviderManager.so

ln -sf libCIMxmlIndicationHandler.so.1 /usr/%PEGASUS_ARCH_LIB/libCIMxmlIndicationHandler.so

ln -sf libCMPIProviderManager.so.1 /usr/%PEGASUS_ARCH_LIB/libCMPIProviderManager.so

ln -sf libsnmpIndicationHandler.so.1 /usr/%PEGASUS_ARCH_LIB/libsnmpIndicationHandler.so

# Create Symbolic Links for Packaged Provider Libraries

Line 334

ln -sf libOSProvider.so.1 /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libOSProvider.so

ln -sf libProcessProvider.so.1 /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libProcessProvider.so

# Create Symbolic Links for Packaged Provider Managers

ln -sf libCMPIProviderManager.so.1 /usr/%PEGASUS_ARCH_LIB/Pegasus/providerManagers/libCMPIProviderManager.so

# Start of section pegasus/rpm/tog-specfiles/tog-pegasus-post.spec

Line 342

Line 346

export PEGASUS_ARCH_LIB=%PEGASUS_ARCH_LIB

if [ -d %PEGASUS_PREV_REPOSITORY_DIR ]; then

# Running Repository Upgrade utility

%PEGASUS_SBIN_DIR/repupgrade %PEGASUS_PREV_REPOSITORY_DIR \

%PEGASUS_REPOSITORY_DIR 2>>%PEGASUS_INSTALL_LOG

/bin/tar -C %PEGASUS_REPOSITORY_PARENT_DIR -cf \

%PEGASUS_PREV_REPOSITORY_DIR`date '+%Y-%m-%d-%s.%N'`.tar \

%PEGASUS_PREV_REPOSITORY_DIR_NAME

rm -rf %PEGASUS_PREV_REPOSITORY_DIR

if [ $1 -eq 1 ]; then

%if %{AUTOSTART}

/sbin/chkconfig --add tog-pegasus

Line 364

Line 359

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

elif [ $1 -gt 1 ]; then

if [ -d %PEGASUS_PREV_REPOSITORY_DIR ]; then

# Running Repository Upgrade utility

%PEGASUS_SBIN_DIR/repupgrade 2>>%PEGASUS_INSTALL_LOG

# Check if the cimserver is running

isRunning=`ps -el | grep cimserver | grep -v "grep cimserver"`

if [ "$isRunning" ]; then

/etc/init.d/tog-pegasus stop

if [ -d %PEGASUS_PREV_REPOSITORY_DIR ]; then

# The old repository was moved to /var/lib/Pegasus/prev_repository. It should now be upgraded to the new repository /var/lib/Pegasus/repository.

%PEGASUS_SBIN_DIR/repupgrade >> %PEGASUS_INSTALL_LOG 2>&1

chown -R cimsrvr %PEGASUS_REPOSITORY_DIR

chgrp -R cimsrvr %PEGASUS_REPOSITORY_DIR

if [ -f %PEGASUS_TRACE_FILE_PATH ]; then

/bin/mv %PEGASUS_TRACE_FILE_PATH %PEGASUS_TRACE_FILE_PATH-`date '+%Y-%m-%d-%R'`

Line 393

Line 390

/sbin/chkconfig --del tog-pegasus;

rm -f %PEGASUS_VARDATA_DIR/cimserver_current.conf;

rm -f %PEGASUS_INSTALL_LOG;

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

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

rm -f %PEGASUS_LOCAL_DOMAIN_SOCKET_PATH;

Line 404

Line 400

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

%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

make --directory /usr/share/Pegasus/samples -s clean

%if %{PEGASUS_BUILD_TEST_RPM}

Line 437

Line 447

%files

%defattr(600, cimsrvr, cimsrvr, 700)

/var/lib/Pegasus/repository

%defattr(644,root,pegasus,755)

/usr/share/Pegasus/mof

%defattr(600, root, pegasus, 755)

%dir /usr/share/doc/tog-pegasus-2.7

%dir /usr/share/doc/tog-pegasus-2.8

%dir /usr/share/Pegasus

%dir /usr/share/Pegasus/scripts

%dir /usr/share/Pegasus/mof

%dir /usr/share/Pegasus/mof/CIM29

%dir /usr/share/Pegasus/mof/Pegasus

%dir /var/lib/Pegasus

%dir /var/lib/Pegasus/cache

%dir /var/lib/Pegasus/log

%dir /var/lib/Pegasus/cache/localauth

%dir /usr/%PEGASUS_ARCH_LIB/Pegasus

%dir /usr/%PEGASUS_ARCH_LIB/Pegasus/providers

%dir /usr/%PEGASUS_ARCH_LIB/Pegasus/providerManagers

%dir %attr(755, root, pegasus) /etc/Pegasus

%dir %attr(755, cimsrvr, cimsrvr) /var/run/tog-pegasus

%dir %attr(1755,cimsrvr,cimsrvr) /var/run/tog-pegasus/socket

%dir %attr(1777,root,pegasus) /var/lib/Pegasus/cache/trace

/usr/share/Pegasus/mof/CIM29/*

/usr/share/Pegasus/mof/Pegasus/*

%config %attr(750,root,pegasus) /etc/init.d/tog-pegasus

%config(noreplace) %attr(644, root, pegasus) /var/lib/Pegasus/cimserver_planned.conf

%config(noreplace) %attr(644,root,root) /var/lib/Pegasus/cimserver_planned.conf

%config(noreplace) /etc/Pegasus/access.conf

%config(noreplace) /etc/pam.d/wbem

Line 474

Line 483

%attr(755,root,pegasus) /usr/bin/*

%attr(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/*.so.1

%attr(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/*.so.1

%attr(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/Pegasus/providerManagers/*.so.1

%attr(750,root,pegasus) /usr/share/Pegasus/scripts/*

%attr(644,root,pegasus) /usr/share/man/man1/*

%attr(644,root,pegasus) /usr/share/man/man8/*

%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.7/Admin_Guide_Release.pdf

%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.8/Admin_Guide_Release.pdf

%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.7/PegasusSSLGuidelines.htm

%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.8/PegasusSSLGuidelines.htm

%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.7/license.txt

%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.8/license.txt

/usr/%PEGASUS_ARCH_LIB/libpegclient.so

/usr/%PEGASUS_ARCH_LIB/libpegcommon.so

/usr/%PEGASUS_ARCH_LIB/libpegprovider.so

/usr/%PEGASUS_ARCH_LIB/libDefaultProviderManager.so

/usr/%PEGASUS_ARCH_LIB/libCIMxmlIndicationHandler.so

/usr/%PEGASUS_ARCH_LIB/libCMPIProviderManager.so

/usr/%PEGASUS_ARCH_LIB/libsnmpIndicationHandler.so

/usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libComputerSystemProvider.so

/usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libOSProvider.so

/usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libProcessProvider.so

/usr/%PEGASUS_ARCH_LIB/Pegasus/providerManagers/libCMPIProviderManager.so

%files devel

%defattr(644,root,pegasus,755)

/usr/share/Pegasus/samples

/usr/include/Pegasus

/usr/share/doc/tog-pegasus-2.7/*

/usr/share/doc/tog-pegasus-2.8/*

/usr/share/Pegasus/html

%attr(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/*.so

%if %{PEGASUS_BUILD_TEST_RPM}

%files test

%defattr(-,root,pegasus,-)

/usr/share/Pegasus/test

%ghost /usr/share/Pegasus/test/tmp/procIdFile

%ghost /usr/share/Pegasus/test/tmp/trapLogFile

%ghost /usr/share/Pegasus/test/tmp/IndicationStressTestLog

%defattr(600,cimsrvr, cimsrvr,700)

/var/lib/Pegasus/testrepository

%endif

Legend:

Removed from v.1.101
changed lines
	Added in v.1.110.4.1

No CVS admin address has been configured