diff --git a/sources b/sources
index 163845d..58b63d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-203f5dfddfc737c5b4ad48f0b7822d0c  tog-pegasus-2.4.1.Beta-1.tar.gz
+303eef5aeb5b2156467a382911467bba  tog-pegasus-2.4.1-1.tar.gz
diff --git a/tog-pegasus.spec b/tog-pegasus.spec
index d32ef71..984d079 100644
--- a/tog-pegasus.spec
+++ b/tog-pegasus.spec
@@ -1,9 +1,13 @@
-#%2003////////////////////////////////////////////////////////////////////////
+#%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
@@ -28,23 +32,25 @@
 #
 # Package spec for PEGASUS 2.4
 #
+%{?!WITH_TEST:   %define WITH_TEST        0}
+# do "rpmbuild --define 'WITH_TEST 1'" to build test RPM .
+%define srcRelease 1
 Summary: OpenPegasus WBEM Services for Linux
 Name: tog-pegasus
-Version: 2.4.1.Beta
-Release: 1
+Version: 2.4.1
+Release: 2
+Epoch:   1
 Group: Systems Management/Base
-Copyright: Open Group Pegasus Open Source
+License: Open Group Pegasus Open Source
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
-Source: ftp://www.opengroup.org/pegasus/tog-pegasus-%{version}-%{release}.tar.gz
+Source: ftp://www.opengroup.org/pegasus/tog-pegasus-%{version}-%{srcRelease}.tar.gz
+Patch0: tog-pegasus-2.4.1.Beta-3.condrestart.patch
+Patch1: tog-pegasus-2.4.1.Beta-3.ppc64.patch
+Patch2: tog-pegasus-2.4.1-Beta3-gcc4.patch
+Patch3: tog-pegasus-2.4.1.pie.patch
 Requires: openssl >= 0.9.6 lsb >= 1.3
 Provides: cimserver tog-pegasus-2.4
 BuildRequires: openssl-devel >= 0.9.6
-Patch0:	  tog-pegasus-2.4.1.Beta-warnings.patch
-Patch1:   tog-pegasus-2.4.1.Beta-permissions.patch
-Patch2:   tog-pegasus-2.4.1.Beta-flags.patch
-Patch3:   tog-pegasus-2.4.1.Beta-ldflags.patch
-Patch4:   tog-pegasus-2.4.1.Beta-ppc64.patch
-Patch5:   tog-pegasus-2.4.1.Beta-ptr64.patch
 
 %description
 OpenPegasus WBEM Services for Linux enables management solutions that deliver
@@ -57,53 +63,65 @@ sources.
 Summary:      The OpenPegasus Software Development Kit
 Group:        Systems Management/Base
 Autoreq: 0
-Requires: tog-pegasus >= 2.4, openssl-devel >= 0.9.6
+Requires: tog-pegasus >= 2.4
 
 %description sdk
 The OpenPegasus WBEM Services for Linux SDK is the developer's kit for the OpenPegasus WBEM
 Services for Linux release. It provides Linux C++ developers with the WBEM files required to
 build WBEM Clients and Providers. It also supports C provider developers via the CMPI interface.
 
+%if %{WITH_TEST}
+%package test
+Summary:      The OpenPegasus Tests
+Group:        Systems Management/Base
+Autoreq: 0
+Requires: tog-pegasus >= 2.4
+
+%description test
+The OpenPegasus WBEM tests for the OpenPegasus 2.4 Linux rpm.
+%endif
+
 %prep
 [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
-%setup
-%patch0 -p1 -b .warnings
-%patch1 -p1 -b .permissions
-%patch2 -p1 -b .flags
-%patch3 -p1 -b .ldflags
-%patch4 -p1 -b .ppc64
-%patch5 -p1 -b .ptr64
 
+%setup -n %{name}-%{version}
 export PEGASUS_ROOT=$RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION
-
+%patch0 -p1 -b .condrestart
+%patch1 -p1 -b .ppc64
+%patch2 -p1 -b .gcc4
+%patch3 -p1 -b .pie
 # Needed for CMPI patch
 ln -s $RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION $RPM_BUILD_DIR/$RPM_PACKAGE_NAME
 
 %build
-export CFLAGS="-g $RPM_OPT_FLAGS"
-export CXXFLAGS="$CFLAGS"
-export LDFLAGS="-pie"
+export PEGASUS_EXTRA_C_FLAGS="-g $RPM_OPT_FLAGS"
+export PEGASUS_EXTRA_CXX_FLAGS="$PEGASUS_EXTRA_C_FLAGS"
+export PEGASUS_EXTRA_LINK_FLAGS="-pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack"
 export PEGASUS_ROOT=$RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION
 export PEGASUS_HOME=$RPM_BUILD_ROOT/usr/pegasus
 %ifarch ia64 x86_64
 %define PEGASUS_HARDWARE_PLATFORM LINUX_IA64_GNU
 %else
-%ifarch ppc ppc64 pseries
+%ifarch ppc
 %define PEGASUS_HARDWARE_PLATFORM LINUX_PPC_GNU
 %else
-%ifarch s390 zseries
-%define PEGASUS_HARDWARE_PLATFORM LINUX_ZSERIES_GNU
-export CFLAGS="$CFLAGS -fsigned-char"
+%ifarch ppc64 pseries
+%define PEGASUS_HARDWARE_PLATFORM LINUX_PPC64_GNU
 %else
-%ifarch s390x
+%ifarch s390
+%define PEGASUS_HARDWARE_PLATFORM LINUX_ZSERIES_GNU
+export  PEGASUS_EXTRA_C_FLAGS="$PEGASUS_EXTRA_C_FLAGS -fsigned-char"
+%else
+%ifarch s390x zseries
 %define PEGASUS_HARDWARE_PLATFORM LINUX_ZSERIES64_GNU
-export CFLAGS="$CFLAGS -fsigned-char"
+export  PEGASUS_EXTRA_C_FLAGS="$PEGASUS_EXTRA_C_FLAGS -fsigned-char"
 %else
 %define PEGASUS_HARDWARE_PLATFORM LINUX_IX86_GNU
 %endif
 %endif
 %endif
 %endif
+%endif
 export PEGASUS_PLATFORM=%PEGASUS_HARDWARE_PLATFORM
 
 export OPENSSL_HOME=/usr
@@ -135,12 +153,16 @@ make repository
 %define PEGASUS_SAMPLES_DIR  /opt/tog-pegasus/samples 
 %define PEGASUS_INCLUDE_DIR  /opt/tog-pegasus/include
 %define PEGASUS_HTML_DIR     /opt/tog-pegasus/html
+
 make --directory=mak -f SDKMakefile stageSDK \
           PEGASUS_STAGING_DIR=%PEGASUS_STAGING_DIR \
           PEGASUS_SAMPLES_DIR=%PEGASUS_SAMPLES_DIR \
           PEGASUS_INCLUDE_DIR=%PEGASUS_INCLUDE_DIR \
           PEGASUS_HTML_DIR=%PEGASUS_HTML_DIR
-
+%if %{WITH_TEST}
+make --directory=$PEGASUS_ROOT -f Makefile.ReleaseTest stageTEST \
+	PEGASUS_ENVVAR_FILE=$PEGASUS_ROOT/env_var_Linux.status
+%endif
 %install
 %define PEGASUS_PROD_DIR       /opt/tog-pegasus
 %define PEGASUS_DEST_LIB_DIR   %PEGASUS_PROD_DIR/lib
@@ -149,11 +171,13 @@ make --directory=mak -f SDKMakefile stageSDK \
 %define PEGASUS_SBIN_DIR       %PEGASUS_PROD_DIR/sbin
 %define PEGASUS_BIN_DIR        %PEGASUS_PROD_DIR/bin
 %define PEGASUS_PRODSHARE_DIR  %PEGASUS_PROD_DIR/share
+%define PEGASUS_DOC_DIR        %PEGASUS_PRODSHARE_DIR/doc
 %define PEGASUS_MAN_DIR        %PEGASUS_PRODSHARE_DIR/man
 %define PEGASUS_MANUSER_DIR    %PEGASUS_MAN_DIR/man1
 %define PEGASUS_MANADMIN_DIR   %PEGASUS_MAN_DIR/man8
 %define PEGASUS_VARDATA_DIR    /var/opt/tog-pegasus
 %define PEGASUS_REPOSITORY_DIR      %PEGASUS_VARDATA_DIR/repository
+%define PEGASUS_PREV_REPOSITORY_DIR %PEGASUS_VARDATA_DIR/prev_repository
 %define PEGASUS_VARDATA_CACHE_DIR   %PEGASUS_VARDATA_DIR/cache
 %define PEGASUS_LOCAL_AUTH_DIR      %PEGASUS_VARDATA_CACHE_DIR/localauth
 %define PEGASUS_MOF_DIR            %PEGASUS_PROD_DIR/mof
@@ -169,6 +193,12 @@ make --directory=mak -f SDKMakefile stageSDK \
 %define PEGASUS_SSL_CERT_FILE      server.pem
 %define PEGASUS_SSL_TRUSTSTORE     client.pem
 %define PEGASUS_INSTALL_SCRIPT_DIR $PEGASUS_ROOT/installs/scripts
+%define PEGASUS_TEST_DIR  /opt/tog-pegasus/test
+%define PEGASUS_TEST_STAGING_DIR  $PEGASUS_HOME/stagingDir
+%define PEGASUS_TEST_BIN_DIR  %PEGASUS_TEST_DIR/bin
+%define PEGASUS_TEST_LIB_DIR  %PEGASUS_TEST_DIR/lib
+%define PEGASUS_TEST_MAK_DIR  %PEGASUS_TEST_DIR/mak
+
 #
 # Make directories
 mkdir -p $RPM_BUILD_ROOT%PEGASUS_VARDATA_DIR/{log,cache,repository}
@@ -176,6 +206,7 @@ mkdir -p $RPM_BUILD_ROOT/%PEGASUS_LOCAL_AUTH_DIR
 mkdir -p $RPM_BUILD_ROOT/%PEGASUS_PROVIDER_LIB_DIR
 mkdir -p $RPM_BUILD_ROOT/%PEGASUS_CONFIG_DIR 
 mkdir -p $RPM_BUILD_ROOT/%PEGASUS_LOG_DIR
+mkdir -p $RPM_BUILD_ROOT/%PEGASUS_DOC_DIR
 mkdir -p $RPM_BUILD_ROOT/%PEGASUS_MAN_DIR/{man1,man8}
 mkdir -p $RPM_BUILD_ROOT%PEGASUS_MOF_DIR/{CIM28,Pegasus}
 mkdir -p $RPM_BUILD_ROOT%PEGASUS_LOCAL_DOMAIN_SOCKET_DIR
@@ -411,6 +442,12 @@ chmod 0744 $RPM_BUILD_ROOT%PEGASUS_SBIN_DIR/init_repository
 #
 install -D -m 0744 %PEGASUS_INSTALL_SCRIPT_DIR/settogpath $RPM_BUILD_ROOT%PEGASUS_SBIN_DIR/settogpath
 
+#
+# doc files
+#
+install -D -m 0444  $PEGASUS_ROOT/doc/Admin_Guide_Release_2.4.pdf $RPM_BUILD_ROOT%PEGASUS_DOC_DIR/Admin_Guide_Release_2.4.pdf
+
+#
 #
 # man pages
 #
@@ -543,6 +580,63 @@ install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/Load/Insta
 install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/Load/MethodProviderR.mof %SAMPLES_DEST_PATH/Providers/Load/MethodProviderR.mof
 install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/Load/SampleProviderSchema.mof %SAMPLES_DEST_PATH/Providers/Load/SampleProviderSchema.mof
 install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Providers/Load/SimpleDisplayConsumerR.mof %SAMPLES_DEST_PATH/Providers/Load/SimpleDisplayConsumerR.mof
+%if %{WITH_TEST}
+#
+# Tests
+#
+%define TEST_DEST_PATH     $RPM_BUILD_ROOT%PEGASUS_TEST_DIR
+mkdir -p %TEST_DEST_PATH/{bin,lib,mak}
+#
+# Test Repository
+#
+%define PEGASUS_TEST_REPOSITORY_DIR %PEGASUS_VARDATA_DIR/testrepository
+mkdir -p  $RPM_BUILD_ROOT%PEGASUS_TEST_REPOSITORY_DIR
+cp -rf %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_REPOSITORY_DIR/*  $RPM_BUILD_ROOT%PEGASUS_TEST_REPOSITORY_DIR
+
+install -D -m 0444 %PEGASUS_TEST_STAGING_DIR/%PEGASUS_TEST_DIR/Makefile %TEST_DEST_PATH/Makefile
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/CompAssoc $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/CompAssoc
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/InvokeMethod2 $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/InvokeMethod2
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/IPC $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/IPC
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestAbstract $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestAbstract
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestArray $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestArray
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestBase64 $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestBase64
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestClassDecl $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestClassDecl
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestClient $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestClient
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestDateTime $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestDateTime
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestFlavor $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestFlavor
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestFormatter $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestFormatter
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestHashTable $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestHashTable
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestInstanceDecl $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestInstanceDecl
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestLogger $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestLogger
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestMethod $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestMethod
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestObject $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestObject
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestOperationContext $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestOperationContext
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestParameter $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestParameter
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestParamValue $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestParamValue
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestProperty $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestProperty
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestQualifier $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestQualifier
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestQualifierDecl $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestQualifierDecl
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestQualifierList $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestQualifierList
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestQueue $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestQueue
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestReference $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestReference
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestResolve $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestResolve
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestResponseHandler $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestResponseHandler
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestScope $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestScope
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestStack $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestStack
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestStopwatch $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestStopwatch
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestString $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestString
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestStrToInstName $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestStrToInstName
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestTimeValue $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestTimeValue
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestToMof $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestToMof
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestValidateClass $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestValidateClass
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TestValue $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TestValue
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/TracerTest $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/TracerTest
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_BIN_DIR/UserManagerTest $RPM_BUILD_ROOT%PEGASUS_TEST_BIN_DIR/UserManagerTest
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_LIB_DIR/libSampleFamilyProvider.so.1   $RPM_BUILD_ROOT%PEGASUS_TEST_LIB_DIR/libSampleFamilyProvider.so.1
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_LIB_DIR/libSampleInstanceProvider.so.1 $RPM_BUILD_ROOT%PEGASUS_TEST_LIB_DIR/libSampleInstanceProvider.so.1
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_LIB_DIR/libSampleMethodProvider.so.1   $RPM_BUILD_ROOT%PEGASUS_TEST_LIB_DIR/libSampleMethodProvider.so.1
+install -D -m 0755 %PEGASUS_TEST_STAGING_DIR%PEGASUS_TEST_MAK_DIR/commands.mak $RPM_BUILD_ROOT%PEGASUS_TEST_MAK_DIR/commands.mak
+%endif
 cd $RPM_BUILD_ROOT
 rm -Rf $PEGASUS_HOME
 
@@ -556,19 +650,15 @@ then
   #
   # Save the current repository to prev_repository.
   #
-
-  REPOSITORY_LOC=%PEGASUS_REPOSITORY_DIR
-  PREV_REPOSITORY_LOC=%PEGASUS_REPOSITORY_DIR"/prev_repository"
-
-  if [[ -d $REPOSITORY_LOC ]]
+  if [[ -d %PEGASUS_REPOSITORY_DIR ]]
   then
-      if [[ -d $PREV_REPOSITORY_LOC ]]
+      if [[ -d %PEGASUS_PREV_REPOSITORY_DIR ]]
       then
-          rm -rf $PREV_REPOSITORY_LOC
+          rm -rf %PEGASUS_PREV_REPOSITORY_DIR
       fi
 
-      mv $REPOSITORY_LOC $PREV_REPOSITORY_LOC
-      mkdir $REPOSITORY_LOC
+      mv %PEGASUS_REPOSITORY_DIR %PEGASUS_PREV_REPOSITORY_DIR
+      mkdir %PEGASUS_REPOSITORY_DIR
   fi
 fi
 
@@ -578,9 +668,8 @@ mkdir -p %PEGASUS_LOG_DIR
 %define INSTALL_LOG %PEGASUS_LOG_DIR/install.log
 echo `date` >%INSTALL_LOG 2>&1
 
-/usr/lib/lsb/install_initd /etc/init.d/tog-pegasus
-
-/bin/chmod -f +w %PEGASUS_LOCAL_DOMAIN_SOCKET_DIR/cimxml.socket
+# Do NOT turn service on by default! 
+#/usr/lib/lsb/install_initd /etc/init.d/tog-pegasus
 
 # Create symbolic links for client libs
 #
@@ -590,6 +679,7 @@ ln -sf libpegclient.so.1 libpegclient.so
 ln -sf libpegprovider.so.1 libpegprovider.so
 ln -sf libDefaultProviderManager.so.1 libDefaultProviderManager.so
 ln -sf libCMPIProviderManager.so.1 libCMPIProviderManager.so
+ln -sf libCIMxmlIndicationHandler.so.1 libCIMxmlIndicationHandler.so
 
 # Create symbolic links for provider libs
 #
@@ -606,7 +696,6 @@ ln -sf libProcessProvider.so.1 libProcessProvider.so
 #  Generate a self signed node certificate
 #
 echo " Generating SSL certificates... "
-HOSTNAME=`uname -n`
 echo "[ req ]" > %PEGASUS_CONFIG_DIR/ssl.cnf
 echo "distinguished_name     = req_distinguished_name"  >> %PEGASUS_CONFIG_DIR/ssl.cnf
 echo "prompt                 = no"  >> %PEGASUS_CONFIG_DIR/ssl.cnf
@@ -616,19 +705,21 @@ echo "ST                     = Berkshire" >> %PEGASUS_CONFIG_DIR/ssl.cnf
 echo "L                      = Reading" >> %PEGASUS_CONFIG_DIR/ssl.cnf
 echo "O                      = The Open Group" >> %PEGASUS_CONFIG_DIR/ssl.cnf
 echo "OU                     = The OpenPegasus Project" >> %PEGASUS_CONFIG_DIR/ssl.cnf
-echo "CN                     = $HOSTNAME" >> %PEGASUS_CONFIG_DIR/ssl.cnf
+echo "CN                     = `host \`hostname\`|cut -d\" \" -f1`" >> %PEGASUS_CONFIG_DIR/ssl.cnf
 chmod 400 %PEGASUS_CONFIG_DIR/ssl.cnf
 chown root %PEGASUS_CONFIG_DIR/ssl.cnf
 chgrp root %PEGASUS_CONFIG_DIR/ssl.cnf
 
-openssl req -x509 -days 365 -newkey rsa:2048 \
+openssl req -x509 -days 3650 -newkey rsa:2048 \
    -nodes -config %PEGASUS_CONFIG_DIR/ssl.cnf   \
    -keyout %PEGASUS_CONFIG_DIR/key.pem -out %PEGASUS_CONFIG_DIR/cert.pem 2>>%INSTALL_LOG
-
-cat %PEGASUS_CONFIG_DIR/key.pem > %PEGASUS_CONFIG_DIR/file_2048.pem
-cat %PEGASUS_CONFIG_DIR/cert.pem > %PEGASUS_CONFIG_DIR/server_2048.pem
-cat %PEGASUS_CONFIG_DIR/cert.pem > %PEGASUS_CONFIG_DIR/client_2048.pem
 chmod 700 %PEGASUS_CONFIG_DIR/*.pem
+cat %PEGASUS_CONFIG_DIR/key.pem > %PEGASUS_CONFIG_DIR/file_2048.pem
+chmod 400 %PEGASUS_CONFIG_DIR/file_2048.pem
+cat %PEGASUS_CONFIG_DIR/cert.pem > %PEGASUS_CONFIG_DIR/server_2048.pem
+chmod 400 %PEGASUS_CONFIG_DIR/server_2048.pem
+cat %PEGASUS_CONFIG_DIR/cert.pem > %PEGASUS_CONFIG_DIR/client_2048.pem
+chmod 400 %PEGASUS_CONFIG_DIR/client_2048.pem
 
 rm -f %PEGASUS_CONFIG_DIR/key.pem %PEGASUS_CONFIG_DIR/cert.pem
 
@@ -638,7 +729,8 @@ then
 else
     cp %PEGASUS_CONFIG_DIR/server_2048.pem %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_CERT_FILE
     cp %PEGASUS_CONFIG_DIR/file_2048.pem %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_KEY_FILE
-    chmod 400 %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_CERT_FILE %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_KEY_FILE
+    chmod 400 %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_KEY_FILE
+    chmod 444 %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_CERT_FILE 
 fi
 
 if [ -f %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_TRUSTSTORE ]
@@ -646,7 +738,7 @@ then
     echo "WARNING: %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_TRUSTSTORE SSL Certificate trust store already exists."
 else
     cp %PEGASUS_CONFIG_DIR/client_2048.pem %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_TRUSTSTORE
-    chmod 400 %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_TRUSTSTORE
+    chmod 444 %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_TRUSTSTORE    
 fi
 
 echo " To start Pegasus manually:"
@@ -655,14 +747,29 @@ echo " Stop it:"
 echo " /etc/init.d/tog-pegasus stop"
 echo " To set up PATH and MANPATH in /etc/profile"
 echo " run /opt/tog-pegasus/sbin/settogpath.";
+elif [ $1 -gt 1 ]; then
+/sbin/service tog-pegasus condrestart
+:;
 fi
 
+%if %{WITH_TEST}
+%post test
+/etc/init.d/tog-pegasus stop
+cd %PEGASUS_VARDATA_DIR
+mv repository repository.bak
+mv testrepository repository
+
+cd %PEGASUS_TEST_DIR
+make create_providerlinks
+make tests
+%endif
+
 %preun
 if [ $1 -eq 0 ]; then
 # Check if the cimserver is running
 isRunning=`ps -el | grep cimserver | grep -v "grep cimserver"`
 if [ "$isRunning" ]; then
-	%PEGASUS_SBIN_DIR/cimserver -s	
+        %PEGASUS_SBIN_DIR/cimserver -s  
 fi
 # Delete the Link to the rc.* Startup Directories
 /usr/lib/lsb/remove_initd /etc/init.d/tog-pegasus;
@@ -670,10 +777,10 @@ fi
 
 %postun
 if [ $1 -eq 0 ]; then
-	rm -rf %PEGASUS_VARDATA_DIR
+        rm -rf %PEGASUS_VARDATA_DIR
         rm -rf %PEGASUS_PROD_DIR
-	rm -rf %PEGASUS_CONFIG_DIR
-	export LC_ALL=C
+        rm -rf %PEGASUS_CONFIG_DIR
+        export LC_ALL=C
 fi
 
 %files
@@ -685,10 +792,11 @@ fi
 %dir %attr(-,root,root) %PEGASUS_LOG_DIR
 %dir %attr(-,root,root) %PEGASUS_PROVIDER_LIB_DIR
 %dir %attr(1555,root,root) %PEGASUS_LOCAL_DOMAIN_SOCKET_DIR
-%defattr(0755,root,root)
+%defattr(-,root,root)
 %PEGASUS_REPOSITORY_DIR
 %defattr(-,root,root)
 %doc %PEGASUS_PROD_DIR/%PEGASUS_LICENSE_FILE
+%doc %PEGASUS_DOC_DIR/Admin_Guide_Release_2.4.pdf
 %doc %PEGASUS_MANUSER_DIR/cimmof.1
 %doc %PEGASUS_MANUSER_DIR/cimprovider.1
 %doc %PEGASUS_MANUSER_DIR/osinfo.1
@@ -696,7 +804,6 @@ fi
 %doc %PEGASUS_MANADMIN_DIR/cimauth.8
 %doc %PEGASUS_MANADMIN_DIR/cimconfig.8
 %doc %PEGASUS_MANADMIN_DIR/cimserver.8
-%doc doc
 %attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/CIM_Core28.mof
 %attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Core28_Qualifiers.mof
 %attr(-,root,root) %PEGASUS_MOF_DIR/CIM28/Core28_CoreElements.mof
@@ -829,19 +936,19 @@ fi
 %config %attr(-,root,root) %PEGASUS_VARDATA_DIR/%PEGASUS_PLANNED_CONFIG_FILE
 %config %attr(-,root,root) /etc/init.d/tog-pegasus
 %config %attr(-,root,root) %PAM_CONF/wbem
-%attr(-,root,root) %PEGASUS_SBIN_DIR/cimauth
-%attr(-,root,root) %PEGASUS_SBIN_DIR/cimserver
-%attr(-,root,root) %PEGASUS_SBIN_DIR/cimservera
-%attr(-,root,root) %PEGASUS_SBIN_DIR/cimuser
-%attr(-,root,root) %PEGASUS_SBIN_DIR/cimconfig
-%attr(-,root,root) %PEGASUS_SBIN_DIR/init_repository
-%attr(-,root,root) %PEGASUS_SBIN_DIR/settogpath
-%attr(-,root,root) %PEGASUS_SBIN_DIR/cimprovagt
-%attr(-,root,root) %PEGASUS_BIN_DIR/cimmof
-%attr(-,root,root) %PEGASUS_BIN_DIR/cimmofl
-%attr(-,root,root) %PEGASUS_BIN_DIR/cimprovider
-%attr(-,root,root) %PEGASUS_BIN_DIR/osinfo
-%attr(-,root,root) %PEGASUS_BIN_DIR/wbemexec
+%attr(0544,root,root) %PEGASUS_SBIN_DIR/cimauth
+%attr(0544,root,root) %PEGASUS_SBIN_DIR/cimserver
+%attr(0544,root,root) %PEGASUS_SBIN_DIR/cimservera
+%attr(0544,root,root) %PEGASUS_SBIN_DIR/cimuser
+%attr(0544,root,root) %PEGASUS_SBIN_DIR/cimconfig
+%attr(0544,root,root) %PEGASUS_SBIN_DIR/init_repository
+%attr(0544,root,root) %PEGASUS_SBIN_DIR/settogpath
+%attr(0544,root,root) %PEGASUS_SBIN_DIR/cimprovagt
+%attr(0555,root,root) %PEGASUS_BIN_DIR/cimmof
+%attr(0555,root,root) %PEGASUS_BIN_DIR/cimmofl
+%attr(0555,root,root) %PEGASUS_BIN_DIR/cimprovider
+%attr(0555,root,root) %PEGASUS_BIN_DIR/osinfo
+%attr(0555,root,root) %PEGASUS_BIN_DIR/wbemexec
 %attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libCIMxmlIndicationHandler.so.1
 %attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libConfigSettingProvider.so.1
 %attr(-,root,root) %PEGASUS_DEST_LIB_DIR/libNamespaceProvider.so.1
@@ -973,6 +1080,59 @@ fi
 %attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/Load/SampleProviderSchema.mof
 %attr(-,root,root) %PEGASUS_SAMPLES_DIR/Providers/Load/SimpleDisplayConsumerR.mof
 
+%if %{WITH_TEST}
+%files test
+%attr(-,root,root) %PEGASUS_TEST_DIR/Makefile
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/CompAssoc
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/InvokeMethod2
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/IPC
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestAbstract
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestArray
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestBase64
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestClassDecl
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestClient
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestDateTime
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestFlavor
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestFormatter
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestHashTable
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestInstanceDecl
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestLogger
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestMethod
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestObject
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestOperationContext
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestParameter
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestParamValue
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestProperty
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestQualifier
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestQualifierDecl
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestQualifierList
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestQueue
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestReference
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestResolve
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestResponseHandler
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestScope
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestStack
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestStopwatch
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestString
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestStrToInstName
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestTimeValue
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestToMof
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestValidateClass
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TestValue
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/TracerTest
+%attr(0555,root,root) %PEGASUS_TEST_BIN_DIR/UserManagerTest
+%attr(-,root,root) %PEGASUS_TEST_LIB_DIR/libSampleFamilyProvider.so.1
+%attr(-,root,root) %PEGASUS_TEST_LIB_DIR/libSampleInstanceProvider.so.1
+%attr(-,root,root) %PEGASUS_TEST_LIB_DIR/libSampleMethodProvider.so.1
+%attr(-,root,root) %PEGASUS_TEST_MAK_DIR/commands.mak
+%PEGASUS_TEST_REPOSITORY_DIR
+%endif
+
 %changelog
-* Mon Jan 17 2005 Jason Vas Dias <jvdias@redhat.com> - 2.4.1_Beta-1
-- Initial build.
+* Thu May 05 2005 Jason Vas Dias <jvdias@redhat.com> - 2.4.1.Beta-3
+- Import of tog-pegasus-2.4.1.Beta-3 .
+- Change .spec file to not build and install test RPM by default.
+  You need to build and install RPMs with --define 'WITH_TEST 1'
+  to get test rpm.
+- Add condrestart option to initscript - invoke condrestart on upgrade.
+- Re-Enable PPC64 support