Overview

File 0001-No-libexec-in-SUSE.patch of Package openlmi-providers

From 6d3b00b2021bd9d2657b043f02654a8d68cd5914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Fri, 4 Oct 2013 14:17:38 +0200
Subject: [PATCH 1/7] No libexec in SUSE

---
 src/account/CMakeLists.txt                     | 2 +-
 src/account/cmpiLMI_Account-cimprovagt         | 2 +-
 src/fan/CMakeLists.txt                         | 2 +-
 src/fan/cmpiLMI_Fan-cimprovagt                 | 2 +-
 src/hardware/CMakeLists.txt                    | 2 +-
 src/hardware/cmpiLMI_Hardware-cimprovagt       | 2 +-
 src/logicalfile/CMakeLists.txt                 | 2 +-
 src/logicalfile/cmpiLMI_LogicalFile-cimprovagt | 2 +-
 src/power/CMakeLists.txt                       | 2 +-
 src/power/cmpiLMI_PowerManagement-cimprovagt   | 2 +-
 src/realmd/CMakeLists.txt                      | 2 +-
 src/realmd/cmpiLMI_Realmd-cimprovagt           | 2 +-
 src/service-dbus/CMakeLists.txt                | 2 +-
 src/service-dbus/cmpiLMI_Service-cimprovagt    | 2 +-
 src/service/CMakeLists.txt                     | 2 +-
 src/service/util/serviceutil.c                 | 4 ++--
 src/software/pycmpiLMI_Software-cimprovagt     | 2 +-
 17 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/account/CMakeLists.txt b/src/account/CMakeLists.txt
index 021b5f2ba979..759dfb513ca0 100644
--- a/src/account/CMakeLists.txt
+++ b/src/account/CMakeLists.txt
@@ -52,5 +52,5 @@ target_link_libraries(${LIBRARY_NAME} openlmicommon ${KONKRETCMPI_LIBRARIES} ${G
 cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers)
 
 install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi/)
-install(PROGRAMS ${ACCOUNT_SCRIPT} DESTINATION libexec/pegasus)
+install(PROGRAMS ${ACCOUNT_SCRIPT} DESTINATION lib/pegasus)
 install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/)
diff --git a/src/account/cmpiLMI_Account-cimprovagt b/src/account/cmpiLMI_Account-cimprovagt
index 4079cbb640d2..81fd5e5c9181 100644
--- a/src/account/cmpiLMI_Account-cimprovagt
+++ b/src/account/cmpiLMI_Account-cimprovagt
@@ -20,4 +20,4 @@
 #
 
 
-/usr/libexec/pegasus/cimprovagt "$@"
+/usr/sbin/cimprovagt "$@"
diff --git a/src/fan/CMakeLists.txt b/src/fan/CMakeLists.txt
index 446e38b820ad..cae90529bd01 100644
--- a/src/fan/CMakeLists.txt
+++ b/src/fan/CMakeLists.txt
@@ -34,4 +34,4 @@ profile_mof_generate("90_LMI_Fan_Profile.mof.skel" "${TARGET_MOF}" "${CIM_CLASSE
 
 install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi/)
 install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/)
-install(PROGRAMS ${FAN_SCRIPT} DESTINATION libexec/pegasus)
+install(PROGRAMS ${FAN_SCRIPT} DESTINATION lib/pegasus)
diff --git a/src/fan/cmpiLMI_Fan-cimprovagt b/src/fan/cmpiLMI_Fan-cimprovagt
index 4079cbb640d2..81fd5e5c9181 100644
--- a/src/fan/cmpiLMI_Fan-cimprovagt
+++ b/src/fan/cmpiLMI_Fan-cimprovagt
@@ -20,4 +20,4 @@
 #
 
 
-/usr/libexec/pegasus/cimprovagt "$@"
+/usr/sbin/cimprovagt "$@"
diff --git a/src/hardware/CMakeLists.txt b/src/hardware/CMakeLists.txt
index 8ccf649765ca..ffd6ebe8665a 100644
--- a/src/hardware/CMakeLists.txt
+++ b/src/hardware/CMakeLists.txt
@@ -38,6 +38,6 @@ set(TARGET_MOF_DMTF "${CMAKE_BINARY_DIR}/mof/90_LMI_${PROVIDER_NAME}_Profile_DMT
 configure_file("90_LMI_${PROVIDER_NAME}_Profile_DMTF.mof" "${TARGET_MOF_DMTF}" COPYONLY)
 
 install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi)
-install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus)
+install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION lib/pegasus)
 install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/)
 install(FILES ${TARGET_MOF_DMTF} DESTINATION share/openlmi-providers/)
diff --git a/src/hardware/cmpiLMI_Hardware-cimprovagt b/src/hardware/cmpiLMI_Hardware-cimprovagt
index 88ef77df2285..0a5c27852402 100755
--- a/src/hardware/cmpiLMI_Hardware-cimprovagt
+++ b/src/hardware/cmpiLMI_Hardware-cimprovagt
@@ -18,4 +18,4 @@
 #
 # Authors: Peter Schiffer <pschiffe@redhat.com>
 
-/usr/libexec/pegasus/cimprovagt "$@"
+/usr/sbin/cimprovagt "$@"
diff --git a/src/logicalfile/CMakeLists.txt b/src/logicalfile/CMakeLists.txt
index 3a09a4ad7a54..ae39b553386d 100644
--- a/src/logicalfile/CMakeLists.txt
+++ b/src/logicalfile/CMakeLists.txt
@@ -39,5 +39,5 @@ set(TARGET_MOF "${CMAKE_BINARY_DIR}/mof/90_LMI_LogicalFile_Profile.mof")
 profile_mof_generate("90_LMI_LogicalFile_Profile.mof.skel" "${TARGET_MOF}" "${CIM_CLASSES}")
 
 install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi)
-install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus)
+install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION lib/pegasus)
 install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/)
diff --git a/src/logicalfile/cmpiLMI_LogicalFile-cimprovagt b/src/logicalfile/cmpiLMI_LogicalFile-cimprovagt
index f6c88424e34b..7c018f16793a 100755
--- a/src/logicalfile/cmpiLMI_LogicalFile-cimprovagt
+++ b/src/logicalfile/cmpiLMI_LogicalFile-cimprovagt
@@ -18,4 +18,4 @@
 #
 # Authors: Jan Synacek <jsynacek@redhat.com>
 
-/usr/libexec/pegasus/cimprovagt "$@"
+/usr/sbin/cimprovagt "$@"
diff --git a/src/power/CMakeLists.txt b/src/power/CMakeLists.txt
index 44b2109ec5ce..62cda855eb11 100644
--- a/src/power/CMakeLists.txt
+++ b/src/power/CMakeLists.txt
@@ -49,5 +49,5 @@ target_link_libraries(${LIBRARY_NAME} openlmicommon ${KONKRETCMPI_LIBRARIES} ${G
 cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers)
 
 install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi/)
-install(PROGRAMS ${POWERMANAGEMENT_SCRIPT} DESTINATION libexec/pegasus)
+install(PROGRAMS ${POWERMANAGEMENT_SCRIPT} DESTINATION lib/pegasus)
 install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/)
diff --git a/src/power/cmpiLMI_PowerManagement-cimprovagt b/src/power/cmpiLMI_PowerManagement-cimprovagt
index 4079cbb640d2..81fd5e5c9181 100644
--- a/src/power/cmpiLMI_PowerManagement-cimprovagt
+++ b/src/power/cmpiLMI_PowerManagement-cimprovagt
@@ -20,4 +20,4 @@
 #
 
 
-/usr/libexec/pegasus/cimprovagt "$@"
+/usr/sbin/cimprovagt "$@"
diff --git a/src/realmd/CMakeLists.txt b/src/realmd/CMakeLists.txt
index dbf2e5463d91..8b294bb702da 100644
--- a/src/realmd/CMakeLists.txt
+++ b/src/realmd/CMakeLists.txt
@@ -49,5 +49,5 @@ set(TARGET_MOF "${CMAKE_BINARY_DIR}/mof/90_LMI_Realmd_Profile.mof")
 profile_mof_generate("90_LMI_Realmd_Profile.mof.skel" "${TARGET_MOF}" "${CIM_CLASSES}")
 
 install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi/)
-install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus)
+install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION lib/pegasus)
 install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/)
diff --git a/src/realmd/cmpiLMI_Realmd-cimprovagt b/src/realmd/cmpiLMI_Realmd-cimprovagt
index f6c88424e34b..7c018f16793a 100755
--- a/src/realmd/cmpiLMI_Realmd-cimprovagt
+++ b/src/realmd/cmpiLMI_Realmd-cimprovagt
@@ -18,4 +18,4 @@
 #
 # Authors: Jan Synacek <jsynacek@redhat.com>
 
-/usr/libexec/pegasus/cimprovagt "$@"
+/usr/sbin/cimprovagt "$@"
diff --git a/src/service-dbus/CMakeLists.txt b/src/service-dbus/CMakeLists.txt
index 3cc2082ac2b2..ee4cd3bf6e99 100644
--- a/src/service-dbus/CMakeLists.txt
+++ b/src/service-dbus/CMakeLists.txt
@@ -33,5 +33,5 @@ set(TARGET_MOF "${CMAKE_BINARY_DIR}/mof/90_LMI_Service_Profile.mof")
 profile_mof_generate("90_LMI_Service_Profile.mof.skel" "${TARGET_MOF}" "LMI_Service")
 
 install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi)
-install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus)
+install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION lib/pegasus)
 install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/)
diff --git a/src/service-dbus/cmpiLMI_Service-cimprovagt b/src/service-dbus/cmpiLMI_Service-cimprovagt
index f6c88424e34b..7c018f16793a 100755
--- a/src/service-dbus/cmpiLMI_Service-cimprovagt
+++ b/src/service-dbus/cmpiLMI_Service-cimprovagt
@@ -18,4 +18,4 @@
 #
 # Authors: Jan Synacek <jsynacek@redhat.com>
 
-/usr/libexec/pegasus/cimprovagt "$@"
+/usr/sbin/cimprovagt "$@"
diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt
index 34d766ea2756..efff6cde3d99 100644
--- a/src/service/CMakeLists.txt
+++ b/src/service/CMakeLists.txt
@@ -24,6 +24,6 @@ target_link_libraries(${LIBRARY_NAME} openlmicommon ${KONKRETCMPI_LIBRARIES})
 # Create registration file
 cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers)
 
-install(PROGRAMS util/servicedisc.sh util/serviceutil.sh DESTINATION libexec)
+install(PROGRAMS util/servicedisc.sh util/serviceutil.sh DESTINATION lib)
 
 install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi)
diff --git a/src/service/util/serviceutil.c b/src/service/util/serviceutil.c
index 5ad904593155..e53af550c48f 100644
--- a/src/service/util/serviceutil.c
+++ b/src/service/util/serviceutil.c
@@ -33,8 +33,8 @@
 #define STATUS_BUFSIZE 2000
 #define MAX_SLIST_CNT 1000
 
-char *suscript = "/usr/libexec/serviceutil.sh";
-char *sdscript = "/usr/libexec/servicedisc.sh";
+char *suscript = "/usr/lib/serviceutil.sh";
+char *sdscript = "/usr/lib/servicedisc.sh";
 
 const char *provider_name = "service";
 const ConfigEntry *provider_config_defaults = NULL;
diff --git a/src/software/pycmpiLMI_Software-cimprovagt b/src/software/pycmpiLMI_Software-cimprovagt
index a0317a10fa9e..fbea45499de2 100755
--- a/src/software/pycmpiLMI_Software-cimprovagt
+++ b/src/software/pycmpiLMI_Software-cimprovagt
@@ -21,4 +21,4 @@
 # provider in Fedora linux. See README.RedHat.Security in tog-pegasus package
 # for details how it's supposed to work.
 
-/usr/libexec/pegasus/cimprovagt "$@"
+/usr/sbin/cimprovagt "$@"
-- 
1.8.4
openSUSE Build Service is sponsored by
Places