summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordenise.eckstein <denise.eckstein>2006-01-24 19:28:51 +0000
committerdenise.eckstein <denise.eckstein>2006-01-24 19:28:51 +0000
commit084633697802c6ea78039dd5b000ebf7e2fb9b84 (patch)
tree73ba7bd514a9371bea8459e3e85706ab0e30e988
parent4d82f6533ee38ab1e97e0a6062ac9ae2e29c5862 (diff)
downloadtog-pegasus-084633697802c6ea78039dd5b000ebf7e2fb9b84.zip
tog-pegasus-084633697802c6ea78039dd5b000ebf7e2fb9b84.tar.gz
tog-pegasus-084633697802c6ea78039dd5b000ebf7e2fb9b84.tar.xz
BUG#:4190
TITLE: Client applications running on x86_64 platform should use the correct version of server-side libraries DESCRIPTION: Modified the Linux RPM to place, on x86_64 platforms, 64-libraries in lib64 and 32-bit libraries in lib.
-rw-r--r--Makefile.Release35
-rw-r--r--Makefile.ReleaseTest2
-rw-r--r--env_var_Linux.status15
-rw-r--r--mak/SDKMakefile2
-rw-r--r--mak/config.mak2
-rw-r--r--rpm/tog-pegasus.spec95
-rw-r--r--rpm/tog-specfiles/tog-pegasus-post.spec2
7 files changed, 84 insertions, 69 deletions
diff --git a/Makefile.Release b/Makefile.Release
index 1315abf..4cc8901 100644
--- a/Makefile.Release
+++ b/Makefile.Release
@@ -472,9 +472,14 @@ prestage_cleanup: FORCE
stage_PegasusProductDirectories: FORCE
$(foreach i, $(PEGASUS_SYSTEM_DIRECTORIES), $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(i);)
$(foreach i, $(PEGASUS_SPECIFIC_DIRECTORIES), $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(i);)
+ $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)
+ $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_DIR)
+ $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)
setpermissions_PegasusProductDirectories: FORCE
$(foreach i, $(PEGASUS_SPECIFIC_DIRECTORIES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(i);)
+ $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_DIR)
+ $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)
stage_PegasusSocketDirectory: FORCE
$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)
@@ -857,10 +862,16 @@ create_ProductInstallationVerificationScript: FORCE
>> $(PEGASUS_HOME)/PegasusVerifyInstall
@$(foreach i, $(PEGASUS_SYSTEM_DIRECTORIES), \
$(ECHO-E) "ls -ld $(i)" >> $(PEGASUS_HOME)/PegasusVerifyInstall;)
+ @$(ECHO-E) "ls -ld $(PEGASUS_DEST_LIB_DIR)" \
+ >> $(PEGASUS_HOME)/PegasusVerifyInstall
@$(ECHO-E) "$(ECHO-E) \"\nPEGASUS-SPECIFIC DIRECTORIES\"" \
>> $(PEGASUS_HOME)/PegasusVerifyInstall
@$(foreach i, $(PEGASUS_SPECIFIC_DIRECTORIES), \
$(ECHO-E) "ls -ld $(i)" >> $(PEGASUS_HOME)/PegasusVerifyInstall;)
+ @$(ECHO-E) "ls -ld $(PEGASUS_PROVIDER_DIR)" \
+ >> $(PEGASUS_HOME)/PegasusVerifyInstall
+ @$(ECHO-E) "ls -ld $(PEGASUS_PROVIDER_LIB_DIR)" \
+ >> $(PEGASUS_HOME)/PegasusVerifyInstall
@$(ECHO-E) "ls -ld $(PEGASUS_REPOSITORY_DIR)" \
>> $(PEGASUS_HOME)/PegasusVerifyInstall
@$(ECHO-E) "ls -ld $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)" \
@@ -997,6 +1008,11 @@ _append_PreambleToSpecFile: FORCE
@$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-intro.spec \
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-arch.spec \
+ >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(ECHO-E) "%global PEGASUS_ARCH_LIB %{_lib}" >> \
+ $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%global OPENSSL_HOME $(OPENSSL_HOME)" >> \
$(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%global OPENSSL_BIN $(OPENSSL_BIN)" >> \
@@ -1049,9 +1065,6 @@ _append_PreambleToSpecFile: FORCE
@$(ECHO-E) "%global PEGASUS_INSTALL_LOG $(PEGASUS_LOG_DIR)/install.log"\
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
- @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-arch.spec \
- >> $(PEGASUS_RPM_SPEC_FILE_PATH)
- @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
_append_PackagesToSpecFile: FORCE
@$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-packages.spec \
@@ -1121,7 +1134,7 @@ _append_postSectionToSpecFile_createSymbolicLinks: FORCE
@$(ECHO-E) " #" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(foreach i, $(PEGASUS_LIBRARY_LINKS), \
$(ECHO-E) " ln -sf $(i)$(LIB_SUFFIX)\
- $(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \
+ $(PEGASUS_DEST_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH);)
@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) " # Create Symbolic Links for Packaged Provider Libraries"\
@@ -1129,7 +1142,7 @@ _append_postSectionToSpecFile_createSymbolicLinks: FORCE
@$(ECHO-E) " #" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(foreach i, $(PEGASUS_PROVIDERS), $(ECHO-E) \
" ln -sf $(i)$(LIB_SUFFIX)\
- $(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \
+ $(PEGASUS_PROVIDER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH);)
@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@@ -1183,6 +1196,10 @@ _append_filesSectionToSpecFile: FORCE
if [ $(i) != $(PEGASUS_CONFIG_DIR) ]; then \
$(ECHO-E) "%dir $(i)" >> \
$(PEGASUS_RPM_SPEC_FILE_PATH); fi; fi; fi; fi;)
+ @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_DIR_2) " \
+ >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_LIB_DIR_2) " \
+ >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%dir %attr($(Prwxr_x___), $(CIMSERVER_USR)," \
"$(CIMSERVER_GRP)) $(PEGASUS_CONFIG_DIR)" \
@@ -1233,10 +1250,10 @@ _append_filesSectionToSpecFile: FORCE
@$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \
"$(PEGASUS_BIN_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \
- "$(PEGASUS_DEST_LIB_DIR)/*$(LIB_SUFFIX)" \
+ "$(PEGASUS_DEST_LIB_DIR_2)/*$(LIB_SUFFIX)" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \
- "$(PEGASUS_PROVIDER_LIB_DIR)/*$(LIB_SUFFIX)" \
+ "$(PEGASUS_PROVIDER_LIB_DIR_2)/*$(LIB_SUFFIX)" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%attr($(Prwxr_x___),$(INSTALL_USR),$(INSTALL_GRP))" \
"$(PEGASUS_SCRIPT_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@@ -1249,10 +1266,10 @@ _append_filesSectionToSpecFile: FORCE
$(ECHO-E) "%doc %attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP))"\
"$(PEGASUS_DOC_DIR)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
@$(foreach i, $(PEGASUS_LIBRARY_LINKS), \
- $(ECHO-E) "$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \
+ $(ECHO-E) "$(PEGASUS_DEST_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH);)
@$(foreach i, $(PEGASUS_PROVIDERS), \
- $(ECHO-E) "$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \
+ $(ECHO-E) "$(PEGASUS_PROVIDER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH);)
@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
diff --git a/Makefile.ReleaseTest b/Makefile.ReleaseTest
index 39886b3..4e6fbf7 100644
--- a/Makefile.ReleaseTest
+++ b/Makefile.ReleaseTest
@@ -54,7 +54,7 @@ PEGASUS_TEST_REPOSITORY_NAME = testrepository
endif
TEST_BIN_FILES_SRCPATH = $(PEGASUS_HOME)/bin
-TEST_LIB_FILES_SRCPATH = $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB)
+TEST_LIB_FILES_SRCPATH = $(PEGASUS_HOME)/lib
TEST_MAK_FILES_SRCPATH = $(ROOT)/mak
MAK_FILES = \
diff --git a/env_var_Linux.status b/env_var_Linux.status
index 1493c85..e26e4b4 100644
--- a/env_var_Linux.status
+++ b/env_var_Linux.status
@@ -6,12 +6,6 @@ PEGASUS_ENABLE_MAKE_INSTALL = yes
#OPENSSL_BIN=
#PEGASUS_PLATFORM=
-ifeq ($(PEGASUS_PLATFORM), LINUX_X86_64_GNU)
-PEGASUS_ARCH_LIB=lib64
-else
-PEGASUS_ARCH_LIB=lib
-endif
-
PEGASUS_OVERRIDE_PRODUCT_ID=yes
PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS=yes
PEGASUS_PRODUCT_NAME="OpenPegasus"
@@ -41,8 +35,11 @@ PEGASUS_PROD_DIR = /usr
PEGASUS_SBIN_DIR = $(PEGASUS_PROD_DIR)/sbin
PEGASUS_BIN_DIR = $(PEGASUS_PROD_DIR)/bin
PEGASUS_DEST_LIB_DIR = $(PEGASUS_PROD_DIR)/$(PEGASUS_ARCH_LIB)
+PEGASUS_DEST_LIB_DIR_2 = $(PEGASUS_PROD_DIR)/%PEGASUS_ARCH_LIB
PEGASUS_PROVIDER_DIR = $(PEGASUS_PROD_DIR)/$(PEGASUS_ARCH_LIB)/Pegasus
+PEGASUS_PROVIDER_DIR_2 = $(PEGASUS_PROD_DIR)/%PEGASUS_ARCH_LIB/Pegasus
PEGASUS_PROVIDER_LIB_DIR = $(PEGASUS_PROVIDER_DIR)/providers
+PEGASUS_PROVIDER_LIB_DIR_2 = $(PEGASUS_PROVIDER_DIR_2)/providers
PEGASUS_DOC_DIR = /usr/share/doc/tog-pegasus-2.5
PEGASUS_MAN_DIR = /usr/share/man
@@ -108,7 +105,6 @@ PEGASUS_SYSTEM_DIRECTORIES = \
/usr \
/usr/sbin \
/usr/bin \
- /usr/$(PEGASUS_ARCH_LIB) \
/usr/share \
/usr/share/doc \
/usr/share/man \
@@ -123,8 +119,6 @@ PEGASUS_SYSTEM_DIRECTORIES = \
PEGASUS_SPECIFIC_DIRECTORIES = \
/usr/share/doc/tog-pegasus-2.5 \
- /usr/$(PEGASUS_ARCH_LIB)/Pegasus \
- /usr/$(PEGASUS_ARCH_LIB)/Pegasus/providers \
/usr/share/Pegasus \
/usr/share/Pegasus/scripts \
/usr/share/Pegasus/mof \
@@ -136,11 +130,10 @@ PEGASUS_SPECIFIC_DIRECTORIES = \
/var/lib/Pegasus/cache/localauth \
/var/lib/Pegasus/cache/trace \
/var/run/tog-pegasus \
- /etc/Pegasus
+ /etc/Pegasus
PEGASUS_DIRECTORIES_TO_BE_REMOVED = \
/usr/share/doc/tog-pegasus-2.5 \
- /usr/$(PEGASUS_ARCH_LIB)/Pegasus \
/usr/share/Pegasus \
/var/lib/Pegasus \
/var/run/tog-pegasus \
diff --git a/mak/SDKMakefile b/mak/SDKMakefile
index 7df4444..b844216 100644
--- a/mak/SDKMakefile
+++ b/mak/SDKMakefile
@@ -388,7 +388,7 @@ _append_filesSectionToSpecFile:
@$(ECHO-E) "$(PEGASUS_SAMPLES_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "$(PEGASUS_DOC_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "$(PEGASUS_HTML_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
- @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_PROVIDER_LIB_DIR)/*$(LIB_LINK_SUFFIX)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_PROVIDER_LIB_DIR_2)/*$(LIB_LINK_SUFFIX)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
removeSampleProviderNamespace:
diff --git a/mak/config.mak b/mak/config.mak
index 632b9f9..9437696 100644
--- a/mak/config.mak
+++ b/mak/config.mak
@@ -161,7 +161,7 @@ endif
#
# To use the PEGASUS_CIM_SCHEMA variable the Schema mof
# files must be placed in the directory
-# $(PEGAUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)
+# $(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)
#
# The value of PEGASUS_CIM_SCHEMA must conform to the
# following syntax:
diff --git a/rpm/tog-pegasus.spec b/rpm/tog-pegasus.spec
index 1fb7214..ddf1eb6 100644
--- a/rpm/tog-pegasus.spec
+++ b/rpm/tog-pegasus.spec
@@ -92,29 +92,6 @@ sources.
#
# End of section pegasus/rpm/tog-specfiles/tog-pegasus-intro.spec
-%global OPENSSL_HOME /usr/include/openssl
-%global OPENSSL_BIN /usr/bin
-%global PEGASUS_PEM_DIR /etc/Pegasus
-%global PEGASUS_SSL_CERT_FILE server.pem
-%global PEGASUS_SSL_KEY_FILE file.pem
-%global PEGASUS_SSL_TRUSTSTORE client.pem
-%global PAM_CONFIG_DIR /etc/pam.d
-%global PEGASUS_CONFIG_DIR /etc/Pegasus
-%global PEGASUS_VARDATA_DIR /var/lib/Pegasus
-%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 PEGASUS_REPOSITORY_DIR /var/lib/Pegasus/repository
-%global PEGASUS_PREV_REPOSITORY_DIR_NAME prev_repository
-%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.5
-
-%global PEGASUS_RPM_ROOT $RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION
-%global PEGASUS_RPM_HOME $RPM_BUILD_ROOT/build/tog-pegasus
-%global PEGASUS_INSTALL_LOG /var/lib/Pegasus/log/install.log
-
# Start of section pegasus/rpm/tog-specfiles/tog-pegasus-arch.spec
#
%ifarch ia64
@@ -145,6 +122,30 @@ sources.
#
# End of section pegasus/rpm/tog-specfiles/tog-pegasus-arch.spec
+%global PEGASUS_ARCH_LIB %{_lib}
+%global OPENSSL_HOME /usr/include/openssl
+%global OPENSSL_BIN /usr/bin
+%global PEGASUS_PEM_DIR /etc/Pegasus
+%global PEGASUS_SSL_CERT_FILE server.pem
+%global PEGASUS_SSL_KEY_FILE file.pem
+%global PEGASUS_SSL_TRUSTSTORE client.pem
+%global PAM_CONFIG_DIR /etc/pam.d
+%global PEGASUS_CONFIG_DIR /etc/Pegasus
+%global PEGASUS_VARDATA_DIR /var/lib/Pegasus
+%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 PEGASUS_REPOSITORY_DIR /var/lib/Pegasus/repository
+%global PEGASUS_PREV_REPOSITORY_DIR_NAME prev_repository
+%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.5
+
+%global PEGASUS_RPM_ROOT $RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION
+%global PEGASUS_RPM_HOME $RPM_BUILD_ROOT/build/tog-pegasus
+%global PEGASUS_INSTALL_LOG /var/lib/Pegasus/log/install.log
+
# Start of section pegasus/rpm/tog-specfiles/tog-pegasus-packages.spec
#
%package devel
@@ -281,18 +282,18 @@ if [ $1 -eq 1 ]; then
# Create Symbolic Links for SDK Libraries
#
- ln -sf libpegclient.so.1 /usr/lib/libpegclient.so
- ln -sf libpegcommon.so.1 /usr/lib/libpegcommon.so
- ln -sf libpegprovider.so.1 /usr/lib/libpegprovider.so
- ln -sf libDefaultProviderManager.so.1 /usr/lib/libDefaultProviderManager.so
- ln -sf libCIMxmlIndicationHandler.so.1 /usr/lib/libCIMxmlIndicationHandler.so
- ln -sf libCMPIProviderManager.so.1 /usr/lib/libCMPIProviderManager.so
+ ln -sf libpegclient.so.1 /usr/%PEGASUS_ARCH_LIB/libpegclient.so
+ ln -sf libpegcommon.so.1 /usr/%PEGASUS_ARCH_LIB/libpegcommon.so
+ 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
# Create Symbolic Links for Packaged Provider Libraries
#
- ln -sf libComputerSystemProvider.so.1 /usr/lib/Pegasus/providers/libComputerSystemProvider.so
- ln -sf libOSProvider.so.1 /usr/lib/Pegasus/providers/libOSProvider.so
- ln -sf libProcessProvider.so.1 /usr/lib/Pegasus/providers/libProcessProvider.so
+ ln -sf libComputerSystemProvider.so.1 /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libComputerSystemProvider.so
+ 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
# Start of section pegasus/rpm/tog-specfiles/tog-pegasus-post.spec
@@ -300,6 +301,8 @@ if [ $1 -eq 1 ]; then
# install remove upgrade reinstall
# %post 1 - 2 2
#
+ 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 \
@@ -378,8 +381,6 @@ fi;
%files
%defattr(600, root, pegasus, 755)
%dir /usr/share/doc/tog-pegasus-2.5
-%dir /usr/lib/Pegasus
-%dir /usr/lib/Pegasus/providers
%dir /usr/share/Pegasus
%dir /usr/share/Pegasus/scripts
%dir /usr/share/Pegasus/mof
@@ -390,6 +391,8 @@ fi;
%dir /var/lib/Pegasus/log
%dir /var/lib/Pegasus/cache/localauth
%dir /var/run/tog-pegasus
+%dir /usr/%PEGASUS_ARCH_LIB/Pegasus
+%dir /usr/%PEGASUS_ARCH_LIB/Pegasus/providers
%dir %attr(750, root, pegasus) /etc/Pegasus
%dir %attr(1555,root,pegasus) /var/run/tog-pegasus/socket
@@ -413,8 +416,8 @@ fi;
%attr(750,root,pegasus) /usr/sbin/*
%attr(755,root,pegasus) /usr/bin/*
-%attr(755,root,pegasus) /usr/lib/*.so.1
-%attr(755,root,pegasus) /usr/lib/Pegasus/providers/*.so.1
+%attr(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/*.so.1
+%attr(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/*.so.1
%attr(750,root,pegasus) /usr/share/Pegasus/scripts/*
%attr(644,root,pegasus) /usr/share/man/man1/*
%attr(640,root,pegasus) /usr/share/man/man8/*
@@ -422,15 +425,15 @@ fi;
%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.5/Admin_Guide_Release.pdf
%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.5/PegasusSSLGuidelines.htm
%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.5/license.txt
-/usr/lib/libpegclient.so
-/usr/lib/libpegcommon.so
-/usr/lib/libpegprovider.so
-/usr/lib/libDefaultProviderManager.so
-/usr/lib/libCIMxmlIndicationHandler.so
-/usr/lib/libCMPIProviderManager.so
-/usr/lib/Pegasus/providers/libComputerSystemProvider.so
-/usr/lib/Pegasus/providers/libOSProvider.so
-/usr/lib/Pegasus/providers/libProcessProvider.so
+/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/Pegasus/providers/libComputerSystemProvider.so
+/usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libOSProvider.so
+/usr/%PEGASUS_ARCH_LIB/Pegasus/providers/libProcessProvider.so
%files devel
%defattr(644,root,pegasus,755)
@@ -438,7 +441,7 @@ fi;
/usr/share/Pegasus/samples
/usr/share/doc/tog-pegasus-2.5/*
/usr/share/Pegasus/html
-%attr(755,root,pegasus) /usr/lib/Pegasus/providers/*.so
+%attr(755,root,pegasus) /usr/%PEGASUS_ARCH_LIB/Pegasus/providers/*.so
%if %{PEGASUS_BUILD_TEST_RPM}
%files test
diff --git a/rpm/tog-specfiles/tog-pegasus-post.spec b/rpm/tog-specfiles/tog-pegasus-post.spec
index ed35d6a..1e7fafb 100644
--- a/rpm/tog-specfiles/tog-pegasus-post.spec
+++ b/rpm/tog-specfiles/tog-pegasus-post.spec
@@ -3,6 +3,8 @@
# install remove upgrade reinstall
# %post 1 - 2 2
#
+ 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 \