Hello community, here is the log from the commit of package openlmi-providers for openSUSE:Factory checked in at 2015-03-25 10:01:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openlmi-providers (Old) and /work/SRC/openSUSE:Factory/.openlmi-providers.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openlmi-providers" Changes: -------- --- /work/SRC/openSUSE:Factory/openlmi-providers/openlmi-providers.changes 2015-03-18 13:05:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openlmi-providers.new/openlmi-providers.changes 2015-03-25 10:01:44.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Mar 24 14:12:28 UTC 2015 - [email protected] + +- Fix tog-pegasus specific pathes + rename 0001-cimprovagt-is-under-usr-sbin-on-SUSE.patch + to 0001-cimprovagt-is-under-usr-lib-pegasus-on-SUSE.patch + rename 0003-Install-cimprovagt-scripts-into-usr-share-Pegasus-sc.patch + to 0003-Install-cimprovagt-scripts-into-usr-share-openlmi-pr.patch + +------------------------------------------------------------------- Old: ---- 0001-cimprovagt-is-under-usr-sbin-on-SUSE.patch 0003-Install-cimprovagt-scripts-into-usr-share-Pegasus-sc.patch New: ---- 0001-cimprovagt-is-under-usr-lib-pegasus-on-SUSE.patch 0003-Install-cimprovagt-scripts-into-usr-share-openlmi-pr.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openlmi-providers.spec ++++++ --- /var/tmp/diff_new_pack.0DL8PT/_old 2015-03-25 10:01:45.000000000 +0100 +++ /var/tmp/diff_new_pack.0DL8PT/_new 2015-03-25 10:01:45.000000000 +0100 @@ -119,11 +119,11 @@ %if 0%{?suse_version} # PATCH-FIX-OPENSUSE, no libexec in SUSE, [email protected] -Patch1: 0001-cimprovagt-is-under-usr-sbin-on-SUSE.patch -# PATCH-FIX-OPENSUSE, install cimprovagt scripts into /usr/share/Pegasus/scripts, [email protected] -Patch2: 0002-Run-dmidecode-with-full-path.patch +Patch1: 0001-cimprovagt-is-under-usr-lib-pegasus-on-SUSE.patch # PATCH-FIX-OPENSUSE, run dmidecode with full path, [email protected] -Patch3: 0003-Install-cimprovagt-scripts-into-usr-share-Pegasus-sc.patch +Patch2: 0002-Run-dmidecode-with-full-path.patch +# PATCH-FIX-OPENSUSE, install cimprovagt scripts into /usr/share/openlmi-providers, [email protected] +Patch3: 0003-Install-cimprovagt-scripts-into-usr-share-openlmi-pr.patch # PATCH-FIX-OPENSUSE, install scripts for service management into /usr/share/openlmi-providers, [email protected] Patch4: 0004-Install-service-scripts-to-usr-share-openlmi-provide.patch # PATCH-FIX-OPENSUSE, default SystemCreationClassName to Linux_ComputerSystem for sfcb, [email protected] @@ -742,8 +742,8 @@ pushd src/software %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %if 0%{?suse_version} -install -m 755 -d $RPM_BUILD_ROOT/%{_datadir}/Pegasus/scripts -install -m 755 pycmpiLMI_Software-cimprovagt $RPM_BUILD_ROOT/%{_datadir}/Pegasus/scripts/ +install -m 755 -d $RPM_BUILD_ROOT/%{_datadir}/openlmi-providers +install -m 755 pycmpiLMI_Software-cimprovagt $RPM_BUILD_ROOT/%{_datadir}/openlmi-providers %else install -m 755 -d $RPM_BUILD_ROOT/%{_libexecdir}/pegasus install -m 755 pycmpiLMI_Software-cimprovagt $RPM_BUILD_ROOT/%{_libexecdir}/pegasus/ @@ -808,8 +808,7 @@ %dir %{_sharedstatedir}/openlmi-registration/reg %ghost %{_sharedstatedir}/openlmi-registration/regdb.sqlite %if 0%{?suse_version} -%dir %{_datadir}/Pegasus -%dir %{_datadir}/Pegasus/scripts +%dir %{_datadir}/%{name} %endif %files libs @@ -866,7 +865,7 @@ %{_datadir}/%{name}/60_LMI_Fan.reg %{_datadir}/%{name}/90_LMI_Fan_Profile.mof %if 0%{?suse_version} -%attr(755, root, root) %{_datadir}/Pegasus/scripts/cmpiLMI_Fan-cimprovagt +%{_datadir}/openlmi-providers/cmpiLMI_Fan-cimprovagt %else %attr(755, root, root) %{_libexecdir}/pegasus/cmpiLMI_Fan-cimprovagt %endif @@ -880,7 +879,7 @@ %{_datadir}/%{name}/60_LMI_PowerManagement.reg %{_datadir}/%{name}/90_LMI_PowerManagement_Profile.mof %if 0%{?suse_version} -%attr(755, root, root) %{_datadir}/Pegasus/scripts/cmpiLMI_PowerManagement-cimprovagt +%{_datadir}/openlmi-providers/cmpiLMI_PowerManagement-cimprovagt %else %attr(755, root, root) %{_libexecdir}/pegasus/cmpiLMI_PowerManagement-cimprovagt %endif @@ -897,7 +896,7 @@ %endif %{_datadir}/%{name}/90_LMI_Service_Profile.mof %if 0%{?suse_version} -%attr(755, root, root) %{_datadir}/Pegasus/scripts/cmpiLMI_Service-cimprovagt +%{_datadir}/openlmi-providers/cmpiLMI_Service-cimprovagt %else %attr(755, root, root) %{_libexecdir}/pegasus/cmpiLMI_Service-cimprovagt %endif @@ -911,7 +910,7 @@ %{_datadir}/%{name}/60_LMI_Account.reg %{_datadir}/%{name}/90_LMI_Account_Profile.mof %if 0%{?suse_version} -%attr(755, root, root) %{_datadir}/Pegasus/scripts/cmpiLMI_Account-cimprovagt +%{_datadir}/openlmi-providers/cmpiLMI_Account-cimprovagt %else %attr(755, root, root) %{_libexecdir}/pegasus/cmpiLMI_Account-cimprovagt %endif @@ -926,7 +925,7 @@ %{_datadir}/%{name}/90_LMI_Hardware_Profile.mof %{_datadir}/%{name}/90_LMI_Hardware_Profile_DMTF.mof %if 0%{?suse_version} -%attr(755, root, root) %{_datadir}/Pegasus/scripts/cmpiLMI_Hardware-cimprovagt +%{_datadir}/openlmi-providers/cmpiLMI_Hardware-cimprovagt %else %attr(755, root, root) %{_libexecdir}/pegasus/cmpiLMI_Hardware-cimprovagt %endif @@ -963,7 +962,7 @@ %if 0%{with_software_dbus} %{_libdir}/cmpi/libcmpiLMI_Software.so %if 0%{?suse_version} -%attr(755, root, root) %{_datadir}/Pegasus/scripts/cmpiLMI_Software-cimprovagt +%{_datadir}/openlmi-providers/cmpiLMI_Software-cimprovagt %else %attr(755, root, root) %{_libexecdir}/pegasus/cmpiLMI_Software-cimprovagt %endif @@ -973,7 +972,7 @@ %{python2_sitelib}/lmi/software/ %{python2_sitelib}/openlmi_software-* %if 0%{?suse_version} -%attr(755, root, root) %{_datadir}/Pegasus/scripts/pycmpiLMI_Software-cimprovagt +%{_datadir}/openlmi-providers/pycmpiLMI_Software-cimprovagt %else %attr(755, root, root) %{_libexecdir}/pegasus/pycmpiLMI_Software-cimprovagt %endif @@ -1011,7 +1010,7 @@ %{_datadir}/%{name}/50_LMI_LogicalFile.reg %{_datadir}/%{name}/90_LMI_LogicalFile_Profile.mof %if 0%{?suse_version} -%attr(755, root, root) %{_datadir}/Pegasus/scripts/cmpiLMI_LogicalFile-cimprovagt +%{_datadir}/openlmi-providers/cmpiLMI_LogicalFile-cimprovagt %else %attr(755, root, root) %{_libexecdir}/pegasus/cmpiLMI_LogicalFile-cimprovagt %endif @@ -1025,7 +1024,7 @@ %{_datadir}/%{name}/60_LMI_Realmd.reg %{_datadir}/%{name}/90_LMI_Realmd_Profile.mof %if 0%{?suse_version} -%attr(755, root, root) %{_datadir}/Pegasus/scripts/cmpiLMI_Realmd-cimprovagt +%{_datadir}/openlmi-providers/cmpiLMI_Realmd-cimprovagt %else %attr(755, root, root) %{_libexecdir}/pegasus/cmpiLMI_Realmd-cimprovagt %endif @@ -1045,7 +1044,7 @@ %{_datadir}/%{name}/70_LMI_JournaldIndicationFilters.mof %{_datadir}/%{name}/90_LMI_Journald_Profile.mof %if 0%{?suse_version} -%attr(755, root, root) %{_datadir}/Pegasus/scripts/cmpiLMI_Journald-cimprovagt +%{_datadir}/openlmi-providers/cmpiLMI_Journald-cimprovagt %else %attr(755, root, root) %{_libexecdir}/pegasus/cmpiLMI_Journald-cimprovagt %endif @@ -1060,7 +1059,7 @@ %{_datadir}/%{name}/60_LMI_SSSD.reg %{_datadir}/%{name}/90_LMI_SSSD_Profile.mof %if 0%{?suse_version} -%attr(755, root, root) %{_datadir}/Pegasus/scripts/cmpiLMI_SSSD-cimprovagt +%{_datadir}/openlmi-providers/cmpiLMI_SSSD-cimprovagt %else %attr(755, root, root) %{_libexecdir}/pegasus/cmpiLMI_SSSD-cimprovagt %endif @@ -1076,7 +1075,7 @@ %{_datadir}/%{name}/60_LMI_SELinux_MethodParameters.mof %{_datadir}/%{name}/90_LMI_SELinux_Profile.mof %if 0%{?suse_version} -%attr(755, root, root) %{_datadir}/Pegasus/scripts/cmpiLMI_SELinux-cimprovagt +%{_datadir}/openlmi-providers/cmpiLMI_SELinux-cimprovagt %else %attr(755, root, root) %{_libexecdir}/pegasus/cmpiLMI_SELinux-cimprovagt %endif @@ -1108,7 +1107,7 @@ %{_datadir}/%{name}/60_LMI_Locale.reg %{_datadir}/%{name}/90_LMI_Locale_Profile.mof %if 0%{?suse_version} -%attr(755, root, root) %{_datadir}/Pegasus/scripts/cmpiLMI_Locale-cimprovagt +%{_datadir}/openlmi-providers/cmpiLMI_Locale-cimprovagt %else %attr(755, root, root) %{_libexecdir}/pegasus/cmpiLMI_Locale-cimprovagt %endif ++++++ 0001-cimprovagt-is-under-usr-lib-pegasus-on-SUSE.patch ++++++ >From a53781709c0b13c4064783013f03b2c7f414f214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 7 Oct 2014 14:13:40 +0200 Subject: [PATCH 02/20] cimprovagt is under /usr/lib/pegasus on SUSE /usr/libexec/pegasus/cimprovagt -> /usr/lib/pegasus/cimprovagt --- src/account/cmpiLMI_Account-cimprovagt | 2 +- src/fan/cmpiLMI_Fan-cimprovagt | 2 +- src/hardware/cmpiLMI_Hardware-cimprovagt | 2 +- src/journald/cmpiLMI_Journald-cimprovagt | 2 +- src/locale/cmpiLMI_Locale-cimprovagt | 2 +- src/logicalfile/cmpiLMI_LogicalFile-cimprovagt | 2 +- src/power/cmpiLMI_PowerManagement-cimprovagt | 2 +- src/realmd/cmpiLMI_Realmd-cimprovagt | 2 +- src/selinux/cmpiLMI_SELinux-cimprovagt | 2 +- src/service-dbus/cmpiLMI_Service-cimprovagt | 2 +- src/service/cmpiLMI_Service-cimprovagt | 2 +- src/software-dbus/cmpiLMI_Software-cimprovagt | 2 +- src/software/pycmpiLMI_Software-cimprovagt | 2 +- src/sssd/cmpiLMI_SSSD-cimprovagt | 2 +- .../files/crt/c/openlmi/src/cmpiLMI_{{PROJECT_NAME}}-cimprovagt | 2 +- .../files/crt/python/openlmi/pycmpi{{PROJECT_NAME}}-cimprovagt | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/account/cmpiLMI_Account-cimprovagt b/src/account/cmpiLMI_Account-cimprovagt index 3f9c577c60a2..800cc7d17023 100644 --- a/src/account/cmpiLMI_Account-cimprovagt +++ b/src/account/cmpiLMI_Account-cimprovagt @@ -20,4 +20,4 @@ # -/usr/libexec/pegasus/cimprovagt "$@" +/usr/lib/pegasus/cimprovagt "$@" diff --git a/src/fan/cmpiLMI_Fan-cimprovagt b/src/fan/cmpiLMI_Fan-cimprovagt index 3f9c577c60a2..800cc7d17023 100644 --- a/src/fan/cmpiLMI_Fan-cimprovagt +++ b/src/fan/cmpiLMI_Fan-cimprovagt @@ -20,4 +20,4 @@ # -/usr/libexec/pegasus/cimprovagt "$@" +/usr/lib/pegasus/cimprovagt "$@" diff --git a/src/hardware/cmpiLMI_Hardware-cimprovagt b/src/hardware/cmpiLMI_Hardware-cimprovagt index 51d0c99bf688..a842a5e65fe5 100755 --- a/src/hardware/cmpiLMI_Hardware-cimprovagt +++ b/src/hardware/cmpiLMI_Hardware-cimprovagt @@ -18,4 +18,4 @@ # # Authors: Peter Schiffer <[email protected]> -/usr/libexec/pegasus/cimprovagt "$@" +/usr/lib/pegasus/cimprovagt "$@" diff --git a/src/journald/cmpiLMI_Journald-cimprovagt b/src/journald/cmpiLMI_Journald-cimprovagt index 0e8e0f0390d1..2bb27e9c6b8a 100755 --- a/src/journald/cmpiLMI_Journald-cimprovagt +++ b/src/journald/cmpiLMI_Journald-cimprovagt @@ -18,4 +18,4 @@ # # Authors: Tomas Bzatek <[email protected]> -/usr/libexec/pegasus/cimprovagt "$@" +/usr/lib/pegasus/cimprovagt "$@" diff --git a/src/locale/cmpiLMI_Locale-cimprovagt b/src/locale/cmpiLMI_Locale-cimprovagt index 1f1de47d276a..d23df400c939 100755 --- a/src/locale/cmpiLMI_Locale-cimprovagt +++ b/src/locale/cmpiLMI_Locale-cimprovagt @@ -18,4 +18,4 @@ # # Authors: Jan Synacek <[email protected]> -/usr/libexec/pegasus/cimprovagt "$@" +/usr/lib/pegasus/cimprovagt "$@" diff --git a/src/logicalfile/cmpiLMI_LogicalFile-cimprovagt b/src/logicalfile/cmpiLMI_LogicalFile-cimprovagt index 1f1de47d276a..d23df400c939 100755 --- a/src/logicalfile/cmpiLMI_LogicalFile-cimprovagt +++ b/src/logicalfile/cmpiLMI_LogicalFile-cimprovagt @@ -18,4 +18,4 @@ # # Authors: Jan Synacek <[email protected]> -/usr/libexec/pegasus/cimprovagt "$@" +/usr/lib/pegasus/cimprovagt "$@" diff --git a/src/power/cmpiLMI_PowerManagement-cimprovagt b/src/power/cmpiLMI_PowerManagement-cimprovagt index 3f9c577c60a2..800cc7d17023 100644 --- a/src/power/cmpiLMI_PowerManagement-cimprovagt +++ b/src/power/cmpiLMI_PowerManagement-cimprovagt @@ -20,4 +20,4 @@ # -/usr/libexec/pegasus/cimprovagt "$@" +/usr/lib/pegasus/cimprovagt "$@" diff --git a/src/realmd/cmpiLMI_Realmd-cimprovagt b/src/realmd/cmpiLMI_Realmd-cimprovagt index 1f1de47d276a..d23df400c939 100755 --- a/src/realmd/cmpiLMI_Realmd-cimprovagt +++ b/src/realmd/cmpiLMI_Realmd-cimprovagt @@ -18,4 +18,4 @@ # # Authors: Jan Synacek <[email protected]> -/usr/libexec/pegasus/cimprovagt "$@" +/usr/lib/pegasus/cimprovagt "$@" diff --git a/src/selinux/cmpiLMI_SELinux-cimprovagt b/src/selinux/cmpiLMI_SELinux-cimprovagt index d8056ef00349..435f3e4cb7ef 100755 --- a/src/selinux/cmpiLMI_SELinux-cimprovagt +++ b/src/selinux/cmpiLMI_SELinux-cimprovagt @@ -18,4 +18,4 @@ # # Authors: Jan Synacek <[email protected]> -/usr/libexec/pegasus/cimprovagt "$@" +/usr/lib/pegasus/cimprovagt "$@" diff --git a/src/service-dbus/cmpiLMI_Service-cimprovagt b/src/service-dbus/cmpiLMI_Service-cimprovagt index 1f1de47d276a..d23df400c939 100755 --- a/src/service-dbus/cmpiLMI_Service-cimprovagt +++ b/src/service-dbus/cmpiLMI_Service-cimprovagt @@ -18,4 +18,4 @@ # # Authors: Jan Synacek <[email protected]> -/usr/libexec/pegasus/cimprovagt "$@" +/usr/lib/pegasus/cimprovagt "$@" diff --git a/src/service/cmpiLMI_Service-cimprovagt b/src/service/cmpiLMI_Service-cimprovagt index f6c88424e34b..2e22cc276a84 100644 --- a/src/service/cmpiLMI_Service-cimprovagt +++ b/src/service/cmpiLMI_Service-cimprovagt @@ -18,4 +18,4 @@ # # Authors: Jan Synacek <[email protected]> -/usr/libexec/pegasus/cimprovagt "$@" +/usr/lib/pegasus/cimprovagt "$@" diff --git a/src/software-dbus/cmpiLMI_Software-cimprovagt b/src/software-dbus/cmpiLMI_Software-cimprovagt index 51d0c99bf688..a842a5e65fe5 100755 --- a/src/software-dbus/cmpiLMI_Software-cimprovagt +++ b/src/software-dbus/cmpiLMI_Software-cimprovagt @@ -18,4 +18,4 @@ # # Authors: Peter Schiffer <[email protected]> -/usr/libexec/pegasus/cimprovagt "$@" +/usr/lib/pegasus/cimprovagt "$@" diff --git a/src/software/pycmpiLMI_Software-cimprovagt b/src/software/pycmpiLMI_Software-cimprovagt index a635067e4857..3d30b41732cc 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/lib/pegasus/cimprovagt "$@" diff --git a/src/sssd/cmpiLMI_SSSD-cimprovagt b/src/sssd/cmpiLMI_SSSD-cimprovagt index 1f1de47d276a..d23df400c939 100755 --- a/src/sssd/cmpiLMI_SSSD-cimprovagt +++ b/src/sssd/cmpiLMI_SSSD-cimprovagt @@ -18,4 +18,4 @@ # # Authors: Jan Synacek <[email protected]> -/usr/libexec/pegasus/cimprovagt "$@" +/usr/lib/pegasus/cimprovagt "$@" diff --git a/tools/devassistant/files/crt/c/openlmi/src/cmpiLMI_{{PROJECT_NAME}}-cimprovagt b/tools/devassistant/files/crt/c/openlmi/src/cmpiLMI_{{PROJECT_NAME}}-cimprovagt index 0098f3bcbb89..e6f43c033266 100755 --- a/tools/devassistant/files/crt/c/openlmi/src/cmpiLMI_{{PROJECT_NAME}}-cimprovagt +++ b/tools/devassistant/files/crt/c/openlmi/src/cmpiLMI_{{PROJECT_NAME}}-cimprovagt @@ -20,4 +20,4 @@ # -/usr/libexec/pegasus/cimprovagt "$@" +/usr/lib/pegasus/cimprovagt "$@" diff --git a/tools/devassistant/files/crt/python/openlmi/pycmpi{{PROJECT_NAME}}-cimprovagt b/tools/devassistant/files/crt/python/openlmi/pycmpi{{PROJECT_NAME}}-cimprovagt index 267447e284c7..74644e0fd805 100755 --- a/tools/devassistant/files/crt/python/openlmi/pycmpi{{PROJECT_NAME}}-cimprovagt +++ b/tools/devassistant/files/crt/python/openlmi/pycmpi{{PROJECT_NAME}}-cimprovagt @@ -22,4 +22,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/lib/pegasus/cimprovagt "$@" -- 2.1.4 ++++++ 0003-Install-cimprovagt-scripts-into-usr-share-openlmi-pr.patch ++++++ >From d720c226a19f5ed4fe08c7f8e590a27850f5e99b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 7 Oct 2014 14:24:43 +0200 Subject: [PATCH 04/20] Install cimprovagt scripts into /usr/share/openlmi-providers --- src/account/CMakeLists.txt | 2 +- src/fan/CMakeLists.txt | 2 +- src/firewalld/CMakeLists.txt | 2 +- src/hardware/CMakeLists.txt | 2 +- src/journald/CMakeLists.txt | 2 +- src/locale/CMakeLists.txt | 2 +- src/logicalfile/CMakeLists.txt | 2 +- src/power/CMakeLists.txt | 2 +- src/realmd/CMakeLists.txt | 2 +- src/selinux/CMakeLists.txt | 2 +- src/service-dbus/CMakeLists.txt | 2 +- src/service/CMakeLists.txt | 2 +- src/software-dbus/CMakeLists.txt | 2 +- src/sssd/CMakeLists.txt | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/account/CMakeLists.txt b/src/account/CMakeLists.txt index 9d416c9a28b6..458d1f702853 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 "${TARGET_MOF}") install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi/) -install(PROGRAMS ${ACCOUNT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${ACCOUNT_SCRIPT} DESTINATION share/openlmi-providers) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) diff --git a/src/fan/CMakeLists.txt b/src/fan/CMakeLists.txt index f2464ef7904a..218b3074a2c9 100644 --- a/src/fan/CMakeLists.txt +++ b/src/fan/CMakeLists.txt @@ -35,4 +35,4 @@ cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers 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 share/openlmi-providers) diff --git a/src/firewalld/CMakeLists.txt b/src/firewalld/CMakeLists.txt index 121250c63084..498c523805d9 100644 --- a/src/firewalld/CMakeLists.txt +++ b/src/firewalld/CMakeLists.txt @@ -28,5 +28,5 @@ target_link_libraries(${LIBRARY_NAME} openlmicommon ${KONKRETCMPI_LIBRARIES} ${G cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers "${TARGET_MOF}") install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi/) -install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/openlmi-providers) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) diff --git a/src/hardware/CMakeLists.txt b/src/hardware/CMakeLists.txt index 92a9ea6fc1a1..f914f8ce155f 100644 --- a/src/hardware/CMakeLists.txt +++ b/src/hardware/CMakeLists.txt @@ -43,6 +43,6 @@ set(TARGET_MOFS "${TARGET_MOF}" "${TARGET_MOF_DMTF}") cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers "${TARGET_MOFS}") install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi) -install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/openlmi-providers) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) install(FILES ${TARGET_MOF_DMTF} DESTINATION share/openlmi-providers/) diff --git a/src/journald/CMakeLists.txt b/src/journald/CMakeLists.txt index 63a52462b999..129712dbd898 100644 --- a/src/journald/CMakeLists.txt +++ b/src/journald/CMakeLists.txt @@ -55,5 +55,5 @@ profile_mof_generate("90_LMI_Journald_Profile.mof.skel" "${TARGET_MOF}" "${CIM_P cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers "${TARGET_MOF}") install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi/) -install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/openlmi-providers) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) diff --git a/src/locale/CMakeLists.txt b/src/locale/CMakeLists.txt index c32d8c9286cc..6df7af32c5ea 100644 --- a/src/locale/CMakeLists.txt +++ b/src/locale/CMakeLists.txt @@ -38,5 +38,5 @@ profile_mof_generate("90_LMI_Locale_Profile.mof.skel" "${TARGET_MOF}" "LMI_Local cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers "${TARGET_MOF}") install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi) -install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/openlmi-providers) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) diff --git a/src/logicalfile/CMakeLists.txt b/src/logicalfile/CMakeLists.txt index 755fe596f0b6..4c9ae4fbf048 100644 --- a/src/logicalfile/CMakeLists.txt +++ b/src/logicalfile/CMakeLists.txt @@ -37,6 +37,6 @@ profile_mof_generate("90_LMI_LogicalFile_Profile.mof.skel" "${TARGET_MOF}" "${CI cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers "${TARGET_MOF}") install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi) -install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/openlmi-providers) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) install(FILES ${CONFIG} DESTINATION ${SYSCONF_INSTALL_DIR}/openlmi/logicalfile/) diff --git a/src/power/CMakeLists.txt b/src/power/CMakeLists.txt index 05d5bbfd71ac..4987bd758580 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 "${TARGET_MOF}") install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi/) -install(PROGRAMS ${POWERMANAGEMENT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${POWERMANAGEMENT_SCRIPT} DESTINATION share/openlmi-providers) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) diff --git a/src/realmd/CMakeLists.txt b/src/realmd/CMakeLists.txt index 961c7b1111ac..89cbc79d1468 100644 --- a/src/realmd/CMakeLists.txt +++ b/src/realmd/CMakeLists.txt @@ -50,5 +50,5 @@ cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi/) -install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/openlmi-providers) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) diff --git a/src/selinux/CMakeLists.txt b/src/selinux/CMakeLists.txt index 5885af56ceed..4cc473ed4e55 100644 --- a/src/selinux/CMakeLists.txt +++ b/src/selinux/CMakeLists.txt @@ -52,7 +52,7 @@ profile_mof_generate("90_LMI_SELinux_Profile.mof.skel" "${TARGET_MOF}" "${CIM_CL cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers "${TARGET_MOF}") install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi) -install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/openlmi-providers) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) # install(FILES ${CONFIG} DESTINATION ${SYSCONF_INSTALL_DIR}/openlmi/selinux/) install(FILES DESTINATION ${SYSCONF_INSTALL_DIR}/openlmi/selinux/) diff --git a/src/service-dbus/CMakeLists.txt b/src/service-dbus/CMakeLists.txt index 02500f9ac361..09b5ae81bf2e 100644 --- a/src/service-dbus/CMakeLists.txt +++ b/src/service-dbus/CMakeLists.txt @@ -41,5 +41,5 @@ cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi) -install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/openlmi-providers) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt index 99f2cac5d2bd..fd005a83c913 100644 --- a/src/service/CMakeLists.txt +++ b/src/service/CMakeLists.txt @@ -31,6 +31,6 @@ cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} "60_LMI_Service.mof" share/ope install(PROGRAMS util/servicedisc.sh util/serviceutil.sh DESTINATION libexec) -install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/openlmi-providers) install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) diff --git a/src/software-dbus/CMakeLists.txt b/src/software-dbus/CMakeLists.txt index f8768605cf50..dc415a7caa46 100644 --- a/src/software-dbus/CMakeLists.txt +++ b/src/software-dbus/CMakeLists.txt @@ -50,5 +50,5 @@ cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi) -install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/openlmi-providers) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) diff --git a/src/sssd/CMakeLists.txt b/src/sssd/CMakeLists.txt index 5a884e8ffc7f..5a5639127a5a 100644 --- a/src/sssd/CMakeLists.txt +++ b/src/sssd/CMakeLists.txt @@ -38,6 +38,6 @@ cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers set(TARGET_MOF "${CMAKE_BINARY_DIR}/mof/90_LMI_SSSD_Profile.mof") profile_mof_generate("90_LMI_SSSD_Profile.mof.skel" "${TARGET_MOF}" "LMI_SSSD") -install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/openlmi-providers) install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) -- 2.1.4 ++++++ 0004-Install-service-scripts-to-usr-share-openlmi-provide.patch ++++++ --- /var/tmp/diff_new_pack.0DL8PT/_old 2015-03-25 10:01:45.000000000 +0100 +++ /var/tmp/diff_new_pack.0DL8PT/_new 2015-03-25 10:01:45.000000000 +0100 @@ -18,7 +18,7 @@ -install(PROGRAMS util/servicedisc.sh util/serviceutil.sh DESTINATION libexec) +install(PROGRAMS util/servicedisc.sh util/serviceutil.sh DESTINATION share/openlmi-providers) - install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/Pegasus/scripts) + install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/openlmi-providers) install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) diff --git a/src/service/util/serviceutil.c b/src/service/util/serviceutil.c -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
