[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/tog-pegasus/devel tog-pegasus-2.4.1-165770.patch, NONE, 1.1 tog-pegasus-2.4.1-de-opt.patch, NONE, 1.1 tog-pegasus-2.4.1-execshield.patch, NONE, 1.1 tog-pegasus-2.4.1-noecho.patch, NONE, 1.1 tog-pegasus-2.4.1-remove_socket.patch, NONE, 1.1 tog-pegasus.spec, 1.2, 1.3



Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16283

Modified Files:
	tog-pegasus.spec 
Added Files:
	tog-pegasus-2.4.1-165770.patch tog-pegasus-2.4.1-de-opt.patch 
	tog-pegasus-2.4.1-execshield.patch 
	tog-pegasus-2.4.1-noecho.patch 
	tog-pegasus-2.4.1-remove_socket.patch 
Log Message:
fix bugs 165880, 165803, 165770

tog-pegasus-2.4.1-165770.patch:
 tog-pegasus.rc |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE tog-pegasus-2.4.1-165770.patch ---
--- tog-pegasus-2.4.1/rpm/tog-pegasus.rc.165770	2005-08-12 15:13:08.024599000 -0400
+++ tog-pegasus-2.4.1/rpm/tog-pegasus.rc	2005-08-12 15:22:47.000000000 -0400
@@ -45,6 +45,7 @@
 case "$1" in
      start)
 	echo -n $"Starting up CIM server: "
+	mkdir -p /var/run/tog-pegasus/socket
 	$CIMSERVER_BIN
 	RETVAL=$?
 	[ "$RETVAL" -eq 0 ] && log_success_msg $"$prog start" || log_failure_msg $"$prog start"
@@ -54,6 +55,9 @@
 	echo -n $"Shutting down CIM server: "
 	killproc cimserver
 	RETVAL=$?
+	if [ "$RETVAL" -eq 0 ]; then
+	    rm -rf /var/run/tog-pegasus;
+	fi;
 	[ "$RETVAL" -eq 0 ] && log_success_msg $"$prog stop" || log_failure_msg $"$prog stop"
 	;;
      status)

tog-pegasus-2.4.1-de-opt.patch:
 env_var_Linux.status                         |   21 +++++++++++----------
 mak/config-linux.mak                         |    2 +-
 rpm/tog-pegasus.rc                           |    2 +-
 src/Pegasus/Common/Constants.h               |   14 +++++++-------
 src/Pegasus/Config/ConfigFileDirLinux.h      |    4 ++--
 src/Pegasus/Config/FixedPropertyTableLinux.h |   18 +++++++++---------
 6 files changed, 31 insertions(+), 30 deletions(-)

--- NEW FILE tog-pegasus-2.4.1-de-opt.patch ---
--- tog-pegasus-2.4.1/mak/config-linux.mak.de-opt	2004-09-16 14:23:56.000000000 -0400
+++ tog-pegasus-2.4.1/mak/config-linux.mak	2005-08-17 20:05:24.879810000 -0400
@@ -41,7 +41,7 @@
 # Build using fixed release settings
 #
 ifdef PEGASUS_USE_RELEASE_DIRS
-  PEGASUS_DEST_LIB_DIR=/opt/tog-pegasus/lib
+  PEGASUS_DEST_LIB_DIR?=/usr/lib
 endif
 
 # PAM support
--- tog-pegasus-2.4.1/rpm/tog-pegasus.rc.de-opt	2005-08-17 20:42:51.968473000 -0400
+++ tog-pegasus-2.4.1/rpm/tog-pegasus.rc	2005-08-17 20:30:11.600602000 -0400
@@ -34,7 +34,7 @@
 # Description:	  init script for Pegasus CIM server
 ### END INIT INFO
 
-CIMSERVER_BIN=/opt/tog-pegasus/sbin/cimserver
+CIMSERVER_BIN=/usr/sbin/cimserver
 prog=cimserver
 
 test -x $CIMSERVER_BIN || exit 5
--- tog-pegasus-2.4.1/src/Pegasus/Common/Constants.h.de-opt	2005-03-17 12:23:22.000000000 -0500
+++ tog-pegasus-2.4.1/src/Pegasus/Common/Constants.h	2005-08-17 20:05:24.886803000 -0400
@@ -331,19 +331,19 @@
 #  define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH  "/opt/freeware/cimom/pegasus/etc/cimxml.socket"
 # elif defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) && !defined(PEGASUS_OS_LSB)
 #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE
-#  define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/etc/opt/tog-pegasus/client.pem"
+#  define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/etc/Pegasus/client.pem"
 #  undef PEGASUS_SSLCLIENT_RANDOMFILE
-#  define PEGASUS_SSLCLIENT_RANDOMFILE      "/var/opt/tog-pegasus/ssl.rnd"
+#  define PEGASUS_SSLCLIENT_RANDOMFILE      "/var/lib/Pegasus/ssl.rnd"
 #  undef PEGASUS_SSLSERVER_RANDOMFILE
-#  define PEGASUS_SSLSERVER_RANDOMFILE      "/var/opt/tog-pegasus/cimserver.rnd"
+#  define PEGASUS_SSLSERVER_RANDOMFILE      "/var/lib/Pegasus/cimserver.rnd"
 #  undef PEGASUS_LOCAL_AUTH_DIR
-#  define PEGASUS_LOCAL_AUTH_DIR            "/var/opt/tog-pegasus/cache/localauth"
+#  define PEGASUS_LOCAL_AUTH_DIR            "/var/lib/Pegasus/cache/localauth"
 #  undef PEGASUS_LOCAL_DOMAIN_SOCKET_PATH
-#  define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH  "/var/run/tog-pegasus/socket/cimxml.socket"
+#  define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH  "/var/run/tog-pegasus/cimxml.socket"
 #  undef PEGASUS_PAM_STANDALONE_PROC_NAME
-#  define PEGASUS_PAM_STANDALONE_PROC_NAME  "/opt/tog-pegasus/sbin/cimservera"
+#  define PEGASUS_PAM_STANDALONE_PROC_NAME  "/usr/sbin/cimservera"
 #  undef PEGASUS_PROVIDER_AGENT_PROC_NAME
-#  define PEGASUS_PROVIDER_AGENT_PROC_NAME  "/opt/tog-pegasus/sbin/cimprovagt"
+#  define PEGASUS_PROVIDER_AGENT_PROC_NAME  "/usr/sbin/cimprovagt"
 # elif defined(PEGASUS_OS_LSB)
 #  define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/etc/opt/lsb-pegasus/client.pem"
 #  undef PEGASUS_SSLCLIENT_RANDOMFILE
--- tog-pegasus-2.4.1/src/Pegasus/Config/ConfigFileDirLinux.h.de-opt	2004-10-17 16:39:37.000000000 -0400
+++ tog-pegasus-2.4.1/src/Pegasus/Config/ConfigFileDirLinux.h	2005-08-17 20:05:24.896793000 -0400
@@ -35,12 +35,12 @@
 /**
     Default file name for the current configuration.
 */
-static char CURRENT_CONFIG_FILE [] = "/var/opt/tog-pegasus/cimserver_current.conf";
+static char CURRENT_CONFIG_FILE [] = "/etc/Pegasus/cimserver_current.conf";
 
 /**
     Default file name for the planned configuration.
 */
-static char PLANNED_CONFIG_FILE [] = "/var/opt/tog-pegasus/cimserver_planned.conf";
+static char PLANNED_CONFIG_FILE [] = "/etc/Pegasus/cimserver_planned.conf";
 
 /**
     Default file name for the cimserver startup file containing the PID.
--- tog-pegasus-2.4.1/src/Pegasus/Config/FixedPropertyTableLinux.h.de-opt	2004-10-17 16:39:37.000000000 -0400
+++ tog-pegasus-2.4.1/src/Pegasus/Config/FixedPropertyTableLinux.h	2005-08-17 20:05:24.904785000 -0400
@@ -43,17 +43,17 @@
     {"enableBinaryRepository", "false"},
 #endif
 #if defined(PEGASUS_USE_RELEASE_DIRS) && !defined(PEGASUS_OS_LSB)
-    {"traceFilePath",       "/var/opt/tog-pegasus/cache/cimserver.trc"},
-    {"logdir",              "/var/opt/tog-pegasus/log"},
+    {"traceFilePath",       "/var/lib/Pegasus/cache/cimserver.trc"},
+    {"logdir",              "/var/log/Pegasus"},
     {"tempLocalAuthDir",    PEGASUS_LOCAL_AUTH_DIR},
-    {"passwordFilePath",    "/etc/opt/tog-pegasus/cimserver.passwd"},
-    {"sslCertificateFilePath", "/etc/opt/tog-pegasus/server.pem"},
-    {"sslKeyFilePath",      "/etc/opt/tog-pegasus/file.pem"},
+    {"passwordFilePath",    "/etc/Pegasus/cimserver.passwd"},
+    {"sslCertificateFilePath", "/etc/Pegasus/server.pem"},
+    {"sslKeyFilePath",      "/etc/Pegasus/file.pem"},
     {"sslTrustStore",       PEGASUS_SSLCLIENT_CERTIFICATEFILE},
-    {"exportSSLTrustStore", "/etc/opt/tog-pegasus/indication_trust.pem"},
-    {"repositoryDir",       "/var/opt/tog-pegasus/repository"},
-    {"providerDir",         "/opt/tog-pegasus/providers/lib"},
-    {"messageDir",         "/opt/tog-pegasus/share/locale/ICU_Messages"},
+    {"exportSSLTrustStore", "/etc/Pegasus/indication_trust.pem"},
+    {"repositoryDir",       "/var/lib/Pegasus/repository"},
+    {"providerDir",         "/usr/lib/Pegasus/providers"},
+    {"messageDir",          "/usr/share/locale"},
 #endif
 #if defined(PEGASUS_USE_RELEASE_DIRS) && defined(PEGASUS_OS_LSB)
     {"traceFilePath",       "/var/opt/lsb-pegasus/cache/cimserver.trc"},
--- tog-pegasus-2.4.1/env_var_Linux.status.de-opt	2005-02-25 14:35:39.000000000 -0500
+++ tog-pegasus-2.4.1/env_var_Linux.status	2005-08-17 20:05:24.914775000 -0400
@@ -23,22 +23,23 @@
 PEGASUS_USE_SYSLOGS=true
 PEGASUS_CIM_SCHEMA=CIM28
 
-PEGASUS_PROD_DIR = /opt/tog-pegasus
+PEGASUS_PROD_DIR = /usr
 PEGASUS_PRODSHARE_DIR = $(PEGASUS_PROD_DIR)/share
 PEGASUS_MAN_DIR = $(PEGASUS_PRODSHARE_DIR)/man
 PEGASUS_MANUSER_DIR = $(PEGASUS_MAN_DIR)/man1
 PEGASUS_MANADMIN_DIR = $(PEGASUS_MAN_DIR)/man8
-PEGASUS_MOF_DIR = $(PEGASUS_PROD_DIR)/mof
+PEGASUS_DATA_DIR= $(PEGASUS_PRODSHARE_DIR)/Pegasus
+PEGASUS_MOF_DIR = $(PEGASUS_DATA_DIR)/mof
 PEGASUS_DEST_LIB_DIR = $(PEGASUS_PROD_DIR)/lib
-PEGASUS_PROVIDER_DIR = $(PEGASUS_PROD_DIR)/providers
-PEGASUS_PROVIDER_LIB_DIR = $(PEGASUS_PROVIDER_DIR)/lib
+PEGASUS_PROVIDER_DIR = $(PEGASUS_PROD_DIR)/lib/Pegasus/providers
+PEGASUS_PROVIDER_LIB_DIR = $(PEGASUS_PROVIDER_DIR)
 PEGASUS_SBIN_DIR = $(PEGASUS_PROD_DIR)/sbin
 PEGASUS_BIN_DIR = $(PEGASUS_PROD_DIR)/bin
-PEGASUS_VARDATA_DIR = /var/opt/tog-pegasus
+PEGASUS_VARDATA_DIR = /var/lib/Pegasus
 PEGASUS_REPOSITORY_DIR = $(PEGASUS_VARDATA_DIR)/repository
-PEGASUS_CONFIG_DIR = /etc/opt/tog-pegasus
+PEGASUS_CONFIG_DIR = /etc/Pegasus
 PEGASUS_VARRUN_DIR = /var/run/tog-pegasus
-PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARRUN_DIR)/socket
+PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARRUN_DIR)
 PEGASUS_VARDATA_CACHE_DIR = $(PEGASUS_VARDATA_DIR)/cache
 PEGASUS_LOCAL_AUTH_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/localauth
 PEGASUS_PLANNED_CONFIG_FILE = cimserver_planned.conf
@@ -47,11 +48,11 @@
 PEGASUS_SSL_CERT_FILE = server.pem
 PEGASUS_SSL_TRUSTSTORE = client.pem
 
-PEGASUS_SAMPLES_DIR = $(PEGASUS_PROD_DIR)/samples
+PEGASUS_SAMPLES_DIR = $(PEGASUS_DATA_DIR)/samples
 PEGASUS_INCLUDE_DIR = $(PEGASUS_PROD_DIR)/include
-PEGASUS_HTML_DIR = $(PEGASUS_PROD_DIR)/html
+PEGASUS_HTML_DIR = $(PEGASUS_DATA_DIR)/html
 
-PEGASUS_TEST_DIR = $(PEGASUS_PROD_DIR)/test
+PEGASUS_TEST_DIR = $(PEGASUS_DATA_DIR)/test
 PEGASUS_TEST_REPOSITORY_DIR = $(PEGASUS_VARDATA_DIR)
 PEGASUS_TEST_REPOSITORY_NAME = testrepository
 

tog-pegasus-2.4.1-execshield.patch:
 program-unix.mak |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE tog-pegasus-2.4.1-execshield.patch ---
--- tog-pegasus-2.4.1/mak/program-unix.mak.execshield	2005-02-16 17:17:51.000000000 -0500
+++ tog-pegasus-2.4.1/mak/program-unix.mak	2005-08-17 15:02:38.416617000 -0400
@@ -1,5 +1,11 @@
 INCLUDES = -I$(ROOT)/src $(EXTRA_INCLUDES)
 
+ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
+  ifdef PEGASUS_EXE_LINK_FLAGS
+	EXTRA_LINK_FLAGS += $(PEGASUS_EXE_LINK_FLAGS)
+  endif
+endif
+
 TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i)
 
 ifeq ($(OS_TYPE),windows)

tog-pegasus-2.4.1-noecho.patch:
 tog-pegasus.rc |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE tog-pegasus-2.4.1-noecho.patch ---
--- tog-pegasus-2.4.1/rpm/tog-pegasus.rc.noecho	2005-08-12 12:14:28.886761000 -0400
+++ tog-pegasus-2.4.1/rpm/tog-pegasus.rc	2005-08-12 12:23:59.724352000 -0400
@@ -48,7 +48,6 @@
 	$CIMSERVER_BIN
 	RETVAL=$?
 	[ "$RETVAL" -eq 0 ] && log_success_msg $"$prog start" || log_failure_msg $"$prog start"
-	echo
 	;;
 
      stop)
@@ -56,7 +55,6 @@
 	killproc cimserver
 	RETVAL=$?
 	[ "$RETVAL" -eq 0 ] && log_success_msg $"$prog stop" || log_failure_msg $"$prog stop"
-	echo
 	;;
      status)
 	pid=`pidofproc $CIMSERVER_BIN`

tog-pegasus-2.4.1-remove_socket.patch:
 tog-pegasus.rc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE tog-pegasus-2.4.1-remove_socket.patch ---
--- tog-pegasus-2.4.1/rpm/tog-pegasus.rc.remove_socket	2005-08-17 21:48:50.515532000 -0400
+++ tog-pegasus-2.4.1/rpm/tog-pegasus.rc	2005-08-17 22:12:38.828357000 -0400
@@ -44,17 +44,18 @@
 
 case "$1" in
      start)
+	[ -e /var/run/tog-pegasus/cimxml.socket ] && rm -f /var/run/tog-pegasus/cimxml.socket
 	echo -n $"Starting up CIM server: "
 	$CIMSERVER_BIN
 	RETVAL=$?
 	[ "$RETVAL" -eq 0 ] && log_success_msg $"$prog start" || log_failure_msg $"$prog start"
 	;;
-
      stop)
 	echo -n $"Shutting down CIM server: "
 	killproc cimserver
 	RETVAL=$?
 	[ "$RETVAL" -eq 0 ] && log_success_msg $"$prog stop" || log_failure_msg $"$prog stop"
+	[ "$RETVAL" -eq 0 ] && [ -e /var/run/tog-pegasus/cimxml.socket ] && rm -f /var/run/tog-pegasus/cimxml.socket
 	;;
      status)
 	pid=`pidofproc $CIMSERVER_BIN`


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tog-pegasus.spec	30 May 2005 21:21:15 -0000	1.2
+++ tog-pegasus.spec	18 Aug 2005 03:18:18 -0000	1.3
@@ -31,26 +31,45 @@
 # tog-pegasus.spec
 #
 # Package spec for PEGASUS 2.4
+#%/////////////////////////////////////////////////////////////////////////////
 #
+# Modified for Red Hat tog-pegasus distribution
+#
+# 	Jason Vas Dias <jvdias redhat com>
+#
+# Copyright(C) Red Hat Inc. 2005
+#
+#%/////////////////////////////////////////////////////////////////////////////
 %{?!WITH_TEST:   %define WITH_TEST        0}
 # do "rpmbuild --define 'WITH_TEST 1'" to build test RPM .
+# NOTE: Must use "rpm -[iU]vh --define 'WITH_TEST 1'" for all RPMs if test rpm
+#       is to be installed.
+#       DO NOT install test rpm for production use.
+%{?!AUTOSTART:   %define AUTOSTART        0}
+# Use "rpm -[iU]vh --define 'AUTOSTART 1'" in order to have cimserver enabled
+# (chkconfig --level=345 tog-pegasus on) and running after installation.
+#
 %define srcRelease 1
 Summary: OpenPegasus WBEM Services for Linux
-Name: tog-pegasus
+Name:    tog-pegasus
 Version: 2.4.1
-Release: 2
+Release: 2.FC5
 Epoch:   1
-Group: Systems Management/Base
+Group:   Systems Management/Base
 License: Open Group Pegasus Open Source
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
-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
+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-noecho.patch
+Patch3:  tog-pegasus-2.4.1-execshield.patch
+Patch4:  tog-pegasus-2.4.1-de-opt.patch
+Patch5:  tog-pegasus-2.4.1-remove_socket.patch
+Requires:      openssl >= 0.9.6 lsb >= 1.3
+Provides:      cimserver tog-pegasus-2.4
 BuildRequires: openssl-devel >= 0.9.6
+BuildConflicts: tog-pegasus
+Requires(post): openssl lsb coreutils bash 
 
 %description
 OpenPegasus WBEM Services for Linux enables management solutions that deliver
@@ -59,13 +78,14 @@
 communication protocol for monitoring and controlling resources from diverse
 sources.
 
-%package sdk
+%package devel
 Summary:      The OpenPegasus Software Development Kit
 Group:        Systems Management/Base
 Autoreq: 0
 Requires: tog-pegasus >= 2.4
+Obsoletes: tog-pegasus-sdk
 
-%description sdk
+%description devel
 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.
@@ -83,22 +103,23 @@
 
 %prep
 [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
-
-%setup -n %{name}-%{version}
+%setup -q -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
+%patch2 -p1 -b .noecho
+%patch3 -p1 -b .execshield
+%patch4 -p1 -b .de-opt
+%patch5 -p1 -b .remove_socket
 # Needed for CMPI patch
-ln -s $RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION $RPM_BUILD_DIR/$RPM_PACKAGE_NAME
+ln -sf $RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION $RPM_BUILD_DIR/$RPM_PACKAGE_NAME
 
 %build
-export PEGASUS_EXTRA_C_FLAGS="-g $RPM_OPT_FLAGS"
+export PEGASUS_EXTRA_C_FLAGS="$RPM_OPT_FLAGS -g -fPIC"
 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_EXE_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
+export PEGASUS_HOME=$RPM_BUILD_ROOT/build
 %ifarch ia64 x86_64
 %define PEGASUS_HARDWARE_PLATFORM LINUX_IA64_GNU
 %else
@@ -111,10 +132,12 @@
 %ifarch s390
 %define PEGASUS_HARDWARE_PLATFORM LINUX_ZSERIES_GNU
 export  PEGASUS_EXTRA_C_FLAGS="$PEGASUS_EXTRA_C_FLAGS -fsigned-char"
+export  PEGASUS_EXTRA_CXX_FLAGS="$PEGASUS_EXTRA_C_FLAGS"
 %else
 %ifarch s390x zseries
 %define PEGASUS_HARDWARE_PLATFORM LINUX_ZSERIES64_GNU
 export  PEGASUS_EXTRA_C_FLAGS="$PEGASUS_EXTRA_C_FLAGS -fsigned-char"
+export  PEGASUS_EXTRA_CXX_FLAGS="$PEGASUS_EXTRA_C_FLAGS"
 %else
 %define PEGASUS_HARDWARE_PLATFORM LINUX_IX86_GNU
 %endif
@@ -145,14 +168,16 @@
 export PEGASUS_NOASSERTS=true
 
 make
+
 export LD_LIBRARY_PATH=$PEGASUS_HOME/lib
 export PATH=$PEGASUS_HOME/bin:$PATH
 make repository
 
+%define PEGASUS_DATA_DIR     /usr/share/Pegasus
 %define PEGASUS_STAGING_DIR  $PEGASUS_HOME/stageSDK
-%define PEGASUS_SAMPLES_DIR  /opt/tog-pegasus/samples 
-%define PEGASUS_INCLUDE_DIR  /opt/tog-pegasus/include
-%define PEGASUS_HTML_DIR     /opt/tog-pegasus/html
+%define PEGASUS_SAMPLES_DIR  %PEGASUS_DATA_DIR/samples
+%define PEGASUS_HTML_DIR     %PEGASUS_DATA_DIR/html
+%define PEGASUS_INCLUDE_DIR  /usr/include
 
 make --directory=mak -f SDKMakefile stageSDK \
           PEGASUS_STAGING_DIR=%PEGASUS_STAGING_DIR \
@@ -163,57 +188,55 @@
 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
-%define PEGASUS_PROVIDER_DIR   %PEGASUS_PROD_DIR/providers
-%define PEGASUS_PROVIDER_LIB_DIR    %PEGASUS_PROVIDER_DIR/lib
-%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
-%define PEGASUS_CONFIG_DIR         /etc/opt/tog-pegasus
-%define PEGASUS_VARRUN_DIR         /var/run/tog-pegasus
-%define PEGASUS_LOCAL_DOMAIN_SOCKET_DIR %PEGASUS_VARRUN_DIR/socket
-%define PAM_CONF                   /etc/pam.d
-%define PEGASUS_LOG_DIR            %PEGASUS_VARDATA_DIR/log
-%define PEGASUS_LICENSE_FILE       license.txt
-%define PEGASUS_PLANNED_CONFIG_FILE cimserver_planned.conf
-%define PEGASUS_PEM_DIR            %PEGASUS_CONFIG_DIR
-%define PEGASUS_SSL_KEY_FILE       file.pem
-%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
+export PEGASUS_ROOT=$RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION
+export PEGASUS_HOME=$RPM_BUILD_ROOT/build
+%define PEGASUS_PROD_DIR       		/usr
+%define PEGASUS_DEST_LIB_DIR   		%PEGASUS_PROD_DIR/lib
+%define PEGASUS_PROVIDER_DIR   		%PEGASUS_PROD_DIR/lib/Pegasus/providers
+%define PEGASUS_PROVIDER_LIB_DIR   	%PEGASUS_PROVIDER_DIR
+%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_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/lib/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_DATA_DIR/mof
+%define PEGASUS_CONFIG_DIR         	/etc/Pegasus
+%define PEGASUS_VARRUN_DIR         	/var/run/tog-pegasus
+%define PEGASUS_LOCAL_DOMAIN_SOCKET_DIR %PEGASUS_VARRUN_DIR
+%define PAM_CONF                   	/etc/pam.d
+%define PEGASUS_LOG_DIR            	/var/log/Pegasus
+%define PEGASUS_LICENSE_FILE       	license.txt
+%define PEGASUS_PLANNED_CONFIG_FILE 	cimserver_planned.conf
+%define PEGASUS_PEM_DIR            	%PEGASUS_CONFIG_DIR
+%define PEGASUS_SSL_KEY_FILE       	file.pem
+%define PEGASUS_SSL_CERT_FILE      	server.pem
+%define PEGASUS_SSL_TRUSTSTORE     	client.pem
+%define PEGASUS_INSTALL_SCRIPT_DIR 	$PEGASUS_HOME/scripts
+%define PEGASUS_TEST_DIR  	   	%PEGASUS_DATA_DIR/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}
+mkdir -p $RPM_BUILD_ROOT%PEGASUS_VARDATA_DIR/{cache,repository}
 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
 
-export PEGASUS_ROOT=$RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION
-export PEGASUS_HOME=$RPM_BUILD_ROOT/usr/pegasus
-
 #
 # Init scripts
 install -D -m 0755  $PEGASUS_ROOT/rpm/tog-pegasus.rc $RPM_BUILD_ROOT/etc/init.d/tog-pegasus
@@ -232,9 +255,8 @@
 install -D -m 0755  $PEGASUS_HOME/bin/osinfo    $RPM_BUILD_ROOT%PEGASUS_BIN_DIR/osinfo
 install -D -m 0755  $PEGASUS_HOME/bin/wbemexec  $RPM_BUILD_ROOT%PEGASUS_BIN_DIR/wbemexec
 
-
+#
 # Libraries
-
 install -D -m 0755  $PEGASUS_HOME/lib/libCIMxmlIndicationHandler.so.1    $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libCIMxmlIndicationHandler.so.1
 install -D -m 0755  $PEGASUS_HOME/lib/libConfigSettingProvider.so.1    $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libConfigSettingProvider.so.1
 install -D -m 0755  $PEGASUS_HOME/lib/libNamespaceProvider.so.1    $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR/libNamespaceProvider.so.1
@@ -420,7 +442,7 @@
 #
 # cimserver config files
 #
-install -D -m 0644  $PEGASUS_ROOT/src/Server/%PEGASUS_PLANNED_CONFIG_FILE $RPM_BUILD_ROOT%PEGASUS_VARDATA_DIR/%PEGASUS_PLANNED_CONFIG_FILE
+install -D -m 0644  $PEGASUS_ROOT/src/Server/%PEGASUS_PLANNED_CONFIG_FILE $RPM_BUILD_ROOT%PEGASUS_CONFIG_DIR/%PEGASUS_PLANNED_CONFIG_FILE
 
 #
 # WBEM pam authentication
@@ -434,32 +456,35 @@
 echo "PEGASUS_REPOSITORY_DIR="%PEGASUS_REPOSITORY_DIR >> initrepository.in
 echo "PEGASUS_BIN_DIR="%PEGASUS_BIN_DIR >> initrepository.in
 echo "PEGASUS_CIM_SCHEMA=28" >> initrepository.in
-cat initrepository.in $PEGASUS_ROOT/installs/scripts/init_repository > $RPM_BUILD_ROOT%PEGASUS_SBIN_DIR/init_repository
+cat initrepository.in installs/scripts/init_repository > $RPM_BUILD_ROOT%PEGASUS_SBIN_DIR/init_repository
 chmod 0744 $RPM_BUILD_ROOT%PEGASUS_SBIN_DIR/init_repository
 
 #
 # script to add tog-pegasus paths to /etc/profile
 #
-install -D -m 0744 %PEGASUS_INSTALL_SCRIPT_DIR/settogpath $RPM_BUILD_ROOT%PEGASUS_SBIN_DIR/settogpath
-
+# install -D -m 0744 installs/scripts/settogpath $RPM_BUILD_ROOT%PEGASUS_SBIN_DIR/settogpath
+# No longer required now that tog-pegasus paths are sane.
 #
 # 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
-
+#install -D -m 0444  doc/Admin_Guide_Release_2.4.pdf $RPM_BUILD_ROOT%PEGASUS_DOC_DIR/Admin_Guide_Release_2.4.pdf
+# let %doc do it!
 #
 #
+
 # man pages
 #
-install -D -m 0444  $PEGASUS_ROOT/rpm/manLinux/man1.Z/cimmof.1 $RPM_BUILD_ROOT%PEGASUS_MANUSER_DIR/cimmof.1
-install -D -m 0444  $PEGASUS_ROOT/rpm/manLinux/man1.Z/cimprovider.1 $RPM_BUILD_ROOT%PEGASUS_MANUSER_DIR/cimprovider.1
-install -D -m 0444  $PEGASUS_ROOT/rpm/manLinux/man1.Z/osinfo.1 $RPM_BUILD_ROOT%PEGASUS_MANUSER_DIR/osinfo.1
-install -D -m 0444  $PEGASUS_ROOT/rpm/manLinux/man1.Z/wbemexec.1 $RPM_BUILD_ROOT%PEGASUS_MANUSER_DIR/wbemexec.1
-install -D -m 0444  $PEGASUS_ROOT/rpm/manLinux/man8.Z/cimauth.8 $RPM_BUILD_ROOT%PEGASUS_MANADMIN_DIR/cimauth.8
-install -D -m 0444  $PEGASUS_ROOT/rpm/manLinux/man8.Z/cimconfig.8 $RPM_BUILD_ROOT%PEGASUS_MANADMIN_DIR/cimconfig.8
-install -D -m 0444  $PEGASUS_ROOT/rpm/manLinux/man8.Z/cimserver.8 $RPM_BUILD_ROOT%PEGASUS_MANADMIN_DIR/cimserver.8
+install -D -m 0444  rpm/manLinux/man1.Z/cimmof.1 $RPM_BUILD_ROOT%PEGASUS_MANUSER_DIR/cimmof.1
+install -D -m 0444  rpm/manLinux/man1.Z/cimprovider.1 $RPM_BUILD_ROOT%PEGASUS_MANUSER_DIR/cimprovider.1
+install -D -m 0444  rpm/manLinux/man1.Z/osinfo.1 $RPM_BUILD_ROOT%PEGASUS_MANUSER_DIR/osinfo.1
+install -D -m 0444  rpm/manLinux/man1.Z/wbemexec.1 $RPM_BUILD_ROOT%PEGASUS_MANUSER_DIR/wbemexec.1
+install -D -m 0444  rpm/manLinux/man8.Z/cimauth.8 $RPM_BUILD_ROOT%PEGASUS_MANADMIN_DIR/cimauth.8
+install -D -m 0444  rpm/manLinux/man8.Z/cimconfig.8 $RPM_BUILD_ROOT%PEGASUS_MANADMIN_DIR/cimconfig.8
+install -D -m 0444  rpm/manLinux/man8.Z/cimserver.8 $RPM_BUILD_ROOT%PEGASUS_MANADMIN_DIR/cimserver.8
+
+#install -D -m 0444  doc/%PEGASUS_LICENSE_FILE $RPM_BUILD_ROOT%PEGASUS_DOC_DIR/%PEGASUS_LICENSE_FILE
+# let %doc do it!
 
-install -D -m 0444  $PEGASUS_ROOT/doc/%PEGASUS_LICENSE_FILE $RPM_BUILD_ROOT%PEGASUS_PROD_DIR/%PEGASUS_LICENSE_FILE
 #
 # SDK
 #
@@ -523,10 +548,24 @@
 install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Provider/CIMProvider.h %INCLUDE_DEST_PATH/Pegasus/Provider/CIMProvider.h
 install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Provider/Linkage.h %INCLUDE_DEST_PATH/Pegasus/Provider/Linkage.h
 install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_INCLUDE_DIR/Pegasus/Provider/ProviderException.h %INCLUDE_DEST_PATH/Pegasus/Provider/ProviderException.h
+# Create symbolic links for client libs
+#
+cd $RPM_BUILD_ROOT%PEGASUS_DEST_LIB_DIR
+ln -sf libpegcommon.so.1 libpegcommon.so
+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
+#
+cd $RPM_BUILD_ROOT%PEGASUS_PROVIDER_LIB_DIR
+ln -sf libComputerSystemProvider.so.1 libComputerSystemProvider.so
+ln -sf libOSProvider.so.1 libOSProvider.so
+ln -sf libProcessProvider.so.1 libProcessProvider.so
 
-
-cd %PEGASUS_STAGING_DIR%PEGASUS_PROD_DIR/
-cp -rf html $RPM_BUILD_ROOT%PEGASUS_PROD_DIR
+cd %PEGASUS_STAGING_DIR%PEGASUS_DATA_DIR/
+cp -rf html $RPM_BUILD_ROOT%PEGASUS_DATA_DIR
 
 install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/Makefile %SAMPLES_DEST_PATH/Makefile 
 install -D -m 0444 %PEGASUS_STAGING_DIR%PEGASUS_SAMPLES_DIR/mak/common.mak %SAMPLES_DEST_PATH/mak/common.mak 
@@ -667,27 +706,10 @@
 mkdir -p %PEGASUS_LOG_DIR
 %define INSTALL_LOG %PEGASUS_LOG_DIR/install.log
 echo `date` >%INSTALL_LOG 2>&1
-
-# Do NOT turn service on by default! 
-#/usr/lib/lsb/install_initd /etc/init.d/tog-pegasus
-
-# Create symbolic links for client libs
-#
-cd %PEGASUS_DEST_LIB_DIR
-ln -sf libpegcommon.so.1 libpegcommon.so
-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
-#
-cd %PEGASUS_PROVIDER_LIB_DIR
-ln -sf libComputerSystemProvider.so.1 libComputerSystemProvider.so
-ln -sf libOSProvider.so.1 libOSProvider.so
-ln -sf libProcessProvider.so.1 libProcessProvider.so
-
+%if %{AUTOSTART}
+/usr/lib/lsb/install_initd /etc/init.d/tog-pegasus
+%endif
+/sbin/ldconfig
 #
 #  Set up the openssl certificate
 #
@@ -695,7 +717,7 @@
 #  Create big random ssl.rnd file, then 
 #  Generate a self signed node certificate
 #
-echo " Generating SSL certificates... "
+#echo " Generating SSL certificates... "
 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
@@ -741,12 +763,6 @@
     chmod 444 %PEGASUS_CONFIG_DIR/%PEGASUS_SSL_TRUSTSTORE    
 fi
 
-echo " To start Pegasus manually:"
-echo " /etc/init.d/tog-pegasus start"
-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
 :;
@@ -758,7 +774,6 @@
 cd %PEGASUS_VARDATA_DIR
 mv repository repository.bak
 mv testrepository repository
-
 cd %PEGASUS_TEST_DIR
 make create_providerlinks
 make tests
@@ -775,14 +790,6 @@
 /usr/lib/lsb/remove_initd /etc/init.d/tog-pegasus;
 fi
 
-%postun
-if [ $1 -eq 0 ]; then
-        rm -rf %PEGASUS_VARDATA_DIR
-        rm -rf %PEGASUS_PROD_DIR
-        rm -rf %PEGASUS_CONFIG_DIR
-        export LC_ALL=C
-fi
-
 %files
 %defattr(-,root,root)
 %dir %attr(-,root,root) %PEGASUS_PROD_DIR
@@ -795,15 +802,14 @@
 %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
-%doc %PEGASUS_MANUSER_DIR/wbemexec.1
-%doc %PEGASUS_MANADMIN_DIR/cimauth.8
-%doc %PEGASUS_MANADMIN_DIR/cimconfig.8
-%doc %PEGASUS_MANADMIN_DIR/cimserver.8
+%PEGASUS_MANUSER_DIR/cimmof.1*
+%PEGASUS_MANUSER_DIR/cimprovider.1*
+%PEGASUS_MANUSER_DIR/osinfo.1*
+%PEGASUS_MANUSER_DIR/wbemexec.1*
+%PEGASUS_MANADMIN_DIR/cimauth.8*
+%PEGASUS_MANADMIN_DIR/cimconfig.8*
+%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
@@ -933,7 +939,7 @@
 %attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_OperatingSystem20R.mof
 %attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_UnixProcess20.mof
 %attr(-,root,root) %PEGASUS_MOF_DIR/Pegasus/PG_UnixProcess20R.mof
-%config %attr(-,root,root) %PEGASUS_VARDATA_DIR/%PEGASUS_PLANNED_CONFIG_FILE
+%config %attr(-,root,root) %PEGASUS_CONFIG_DIR/%PEGASUS_PLANNED_CONFIG_FILE
 %config %attr(-,root,root) /etc/init.d/tog-pegasus
 %config %attr(-,root,root) %PAM_CONF/wbem
 %attr(0544,root,root) %PEGASUS_SBIN_DIR/cimauth
@@ -942,7 +948,7 @@
 %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/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
@@ -980,8 +986,23 @@
 %attr(-,root,root) %PEGASUS_PROVIDER_LIB_DIR/libOSProvider.so.1
 %attr(-,root,root) %PEGASUS_PROVIDER_LIB_DIR/libProcessProvider.so.1
 
-
-%files sdk
+%files devel
+%defattr(0555,root,root)
+# symbolic links for client libs
+#
+%PEGASUS_DEST_LIB_DIR/libpegcommon.so
+%PEGASUS_DEST_LIB_DIR/libpegclient.so
+%PEGASUS_DEST_LIB_DIR/libpegprovider.so
+%PEGASUS_DEST_LIB_DIR/libDefaultProviderManager.so
+%PEGASUS_DEST_LIB_DIR/libCMPIProviderManager.so
+%PEGASUS_DEST_LIB_DIR/libCIMxmlIndicationHandler.so
+# symbolic links for provider libs
+#
+%PEGASUS_PROVIDER_LIB_DIR/libComputerSystemProvider.so
+%PEGASUS_PROVIDER_LIB_DIR/libOSProvider.so
+%PEGASUS_PROVIDER_LIB_DIR/libProcessProvider.so
+# header files
+#
 %defattr(0444,root,root)
 %attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Client/CIMClientException.h
 %attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Client/CIMClient.h
@@ -1036,6 +1057,7 @@
 %attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Provider/Linkage.h
 %attr(-,root,root) %PEGASUS_INCLUDE_DIR/Pegasus/Provider/ProviderException.h
 %PEGASUS_HTML_DIR
+# make files
 %attr(-,root,root) %PEGASUS_SAMPLES_DIR/Makefile 
 %attr(-,root,root) %PEGASUS_SAMPLES_DIR/mak/common.mak 
 %attr(-,root,root) %PEGASUS_SAMPLES_DIR/mak/config.mak 
@@ -1129,7 +1151,23 @@
 %endif
 
 %changelog
-* Thu May 05 2005 Jason Vas Dias <jvdias redhat com> - 2.4.1.Beta-3
+* Wed Aug 17 2005 Jason Vas Dias <jvdias redhat com> - 2.4.1-2.rhel4
+- fix bug 165805: change location from /opt root to / root
+                  cimserver not running by default
+		  rename 'sdk' package 'devel' package
+                  compile all executables with ExecShield
+- fix bug 165880: no logging during post scriptlet
+                  no postun scriptlets do 'rm -rf'
+		  added Requires(post) 
+		  moved symlinks into -devel package 
+- further fix for bug 165770: cimserver no longer stores socket in subdirectory
+
+* Fri Aug 12 2005 Jason Vas Dias <jvdias redhat com> - 2.4.1-2
+- fix bug 165805: remove 'echo's after initscript's use of redhat-lsb's
+  log_success_msg / log_failure_msg functions.
+- fix bug 165770: make initscript stop do 'rm -rf /var/run/tog-pegasus'
+
+* Thu May 05 2005 Jason Vas Dias <jvdias redhat com> - 2.4.1-1
 - 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'


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]