spec: allow to change interop namespace for tog-pegasus

1 files changed, 44 insertions, 31 deletions

diff --git a/openlmi-providers.spec b/openlmi-providers.spec
index fa42992..393f8cb 100644
--- a/openlmi-providers.spec
+++ b/openlmi-providers.spec
@@ -8,6 +8,9 @@
 %global required_konkret_ver 0.9.0-2
 %global required_libuser_ver 0.60
 
+# interop namepsace for tog-pegasus, sfcbd always uses root/interop
+%global interop root/interop
+
 %global with_devassistant 1
 %global with_journald 1
 %global with_service 1
@@ -24,6 +27,7 @@
 %global with_pcp 0
 %global with_realmd 0
 %global with_fan 0
+%global interop root/PG_InterOp
 %endif
 
 %if 0%{?rhel}
@@ -32,7 +36,7 @@
 
 Name:           openlmi-providers
 Version:        0.4.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Set of basic CIM providers
 
 %if 0%{?suse_version}
@@ -899,7 +903,7 @@ if [ "$1" -gt 1 ]; then
     %{_bindir}/openlmi-mof-register -v %{providers_version} unregister \
         %{_datadir}/%{name}/60_LMI_Fan.mof \
         %{_datadir}/%{name}/60_LMI_Fan.reg || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus unregister \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus unregister \
         %{_datadir}/%{name}/90_LMI_Fan_Profile.mof || :;
 fi >> %logfile 2>&1
 %endif
@@ -909,7 +913,7 @@ if [ "$1" -gt 1 ]; then
     %{_bindir}/openlmi-mof-register -v %{providers_version} unregister \
         %{_datadir}/%{name}/60_LMI_PowerManagement.mof \
         %{_datadir}/%{name}/60_LMI_PowerManagement.reg || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus unregister \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus unregister \
         %{_datadir}/%{name}/90_LMI_PowerManagement_Profile.mof || :;
 fi >> %logfile 2>&1
 
@@ -918,7 +922,7 @@ if [ "$1" -gt 1 ]; then
     %{_bindir}/openlmi-mof-register -v %{providers_version} unregister \
         %{_datadir}/%{name}/60_LMI_Service.mof \
         %{_datadir}/%{name}/60_LMI_Service.reg || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus unregister \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus unregister \
         %{_datadir}/%{name}/90_LMI_Service_Profile.mof || :;
 fi >> %logfile 2>&1
 
@@ -928,7 +932,7 @@ if [ "$1" -gt 1 ]; then
     %{_bindir}/openlmi-mof-register -v %{providers_version} unregister \
         %{_datadir}/%{name}/60_LMI_Account.mof \
         %{_datadir}/%{name}/60_LMI_Account.reg || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus unregister \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus unregister \
         %{_datadir}/%{name}/90_LMI_Account_Profile.mof || :;
 fi >> %logfile 2>&1
 %endif
@@ -936,9 +940,11 @@ fi >> %logfile 2>&1
 %pre -n openlmi-software
 if [ "$1" -gt 1 ]; then
     # delete indication filters
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop unregister \
+    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c sfcbd unregister \
+        %{_datadir}/%{name}/70_LMI_SoftwareIndicationFilters.mof || :;
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus unregister \
         %{_datadir}/%{name}/70_LMI_SoftwareIndicationFilters.mof || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus unregister \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus unregister \
         %{_datadir}/%{name}/90_LMI_Software_Profile.mof || :;
     %{_bindir}/openlmi-mof-register --just-mofs -c tog-pegasus unregister \
         %{_datadir}/%{name}/60_LMI_Software_MethodParameters.mof || :;
@@ -952,7 +958,7 @@ if [ "$1" -gt 1 ]; then
     %{_bindir}/openlmi-mof-register -v %{providers_version} unregister \
         %{_datadir}/%{name}/60_LMI_LogicalFile.mof \
         %{_datadir}/%{name}/60_LMI_LogicalFile.reg || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus unregister \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus unregister \
         %{_datadir}/%{name}/90_LMI_LogicalFile_Profile.mof || :;
 fi >> %logfile 2>&1
 
@@ -962,7 +968,7 @@ if [ "$1" -gt 1 ]; then
     %{_bindir}/openlmi-mof-register -v %{providers_version} unregister \
         %{_datadir}/%{name}/60_LMI_Realmd.mof \
         %{_datadir}/%{name}/60_LMI_Realmd.reg || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus unregister \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus unregister \
         %{_datadir}/%{name}/90_LMI_Realmd_Profile.mof || :;
 fi >> %logfile 2>&1
 %endif
@@ -972,7 +978,7 @@ if [ "$1" -gt 1 ]; then
     %{_bindir}/openlmi-mof-register -v %{providers_version} unregister \
         %{_datadir}/%{name}/60_LMI_Hardware.mof \
         %{_datadir}/%{name}/60_LMI_Hardware.reg || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus unregister \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus unregister \
         %{_datadir}/%{name}/90_LMI_Hardware_Profile.mof \
         %{_datadir}/%{name}/90_LMI_Hardware_Profile_DMTF.mof || :;
 fi >> %logfile 2>&1
@@ -996,7 +1002,7 @@ if [ "$1" -gt 1 ]; then
     %{_bindir}/openlmi-mof-register -v %{providers_version} unregister \
         %{_datadir}/%{name}/60_LMI_Journald.mof \
         %{_datadir}/%{name}/60_LMI_Journald.reg || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus unregister \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus unregister \
         %{_datadir}/%{name}/90_LMI_Journald_Profile.mof || :;
 fi >> %logfile 2>&1
 %endif
@@ -1008,7 +1014,7 @@ if [ "$1" -ge 1 ]; then
     %{_bindir}/openlmi-mof-register -v %{providers_version} register \
         %{_datadir}/%{name}/60_LMI_Fan.mof \
         %{_datadir}/%{name}/60_LMI_Fan.reg || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus register \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus register \
         %{_datadir}/%{name}/90_LMI_Fan_Profile.mof || :;
 fi >> %logfile 2>&1
 %endif
@@ -1018,7 +1024,7 @@ if [ "$1" -ge 1 ]; then
     %{_bindir}/openlmi-mof-register -v %{providers_version} register \
         %{_datadir}/%{name}/60_LMI_PowerManagement.mof \
         %{_datadir}/%{name}/60_LMI_PowerManagement.reg || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus register \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus register \
         %{_datadir}/%{name}/90_LMI_PowerManagement_Profile.mof || :;
 fi >> %logfile 2>&1
 
@@ -1027,7 +1033,7 @@ if [ "$1" -ge 1 ]; then
     %{_bindir}/openlmi-mof-register -v %{providers_version} register \
         %{_datadir}/%{name}/60_LMI_Service.mof \
         %{_datadir}/%{name}/60_LMI_Service.reg || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus register \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus register \
         %{_datadir}/%{name}/90_LMI_Service_Profile.mof || :;
 fi >> %logfile 2>&1
 
@@ -1037,7 +1043,7 @@ if [ "$1" -ge 1 ]; then
     %{_bindir}/openlmi-mof-register -v %{providers_version} register \
         %{_datadir}/%{name}/60_LMI_Account.mof \
         %{_datadir}/%{name}/60_LMI_Account.reg || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus register \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus register \
         %{_datadir}/%{name}/90_LMI_Account_Profile.mof || :;
 fi >> %logfile 2>&1
 %endif
@@ -1048,9 +1054,11 @@ if [ "$1" -ge 1 ]; then
         %{_datadir}/%{name}/60_LMI_Software.mof \
         %{_datadir}/%{name}/LMI_Software.reg || :;
     # install indication filters for sfcbd
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop register \
+    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c sfcbd register \
+        %{_datadir}/%{name}/70_LMI_SoftwareIndicationFilters.mof || :;
+        %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus register \
         %{_datadir}/%{name}/70_LMI_SoftwareIndicationFilters.mof || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus register \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus register \
         %{_datadir}/%{name}/90_LMI_Software_Profile.mof || :;
     %{_bindir}/openlmi-mof-register --just-mofs -c tog-pegasus register \
         %{_datadir}/%{name}/60_LMI_Software_MethodParameters.mof || :;
@@ -1061,7 +1069,7 @@ if [ "$1" -ge 1 ]; then
     %{_bindir}/openlmi-mof-register -v %{providers_version} register \
         %{_datadir}/%{name}/60_LMI_LogicalFile.mof \
         %{_datadir}/%{name}/60_LMI_LogicalFile.reg || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus register \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus register \
         %{_datadir}/%{name}/90_LMI_LogicalFile_Profile.mof || :;
 fi >> %logfile 2>&1
 
@@ -1071,7 +1079,7 @@ if [ "$1" -ge 1 ]; then
     %{_bindir}/openlmi-mof-register -v %{providers_version} register \
         %{_datadir}/%{name}/60_LMI_Realmd.mof \
         %{_datadir}/%{name}/60_LMI_Realmd.reg || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus register \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus register \
         %{_datadir}/%{name}/90_LMI_Realmd_Profile.mof || :;
 fi >> %logfile 2>&1
 %endif
@@ -1081,7 +1089,7 @@ if [ "$1" -ge 1 ]; then
     %{_bindir}/openlmi-mof-register -v %{providers_version} register \
         %{_datadir}/%{name}/60_LMI_Hardware.mof \
         %{_datadir}/%{name}/60_LMI_Hardware.reg || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus register \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus register \
         %{_datadir}/%{name}/90_LMI_Hardware_Profile.mof \
         %{_datadir}/%{name}/90_LMI_Hardware_Profile_DMTF.mof || :;
 fi >> %logfile 2>&1
@@ -1092,7 +1100,7 @@ if [ "$1" -ge 1 ]; then
     %{_bindir}/openlmi-mof-register -v %{providers_version} register \
         %{_datadir}/%{name}/60_LMI_Journald.mof \
         %{_datadir}/%{name}/60_LMI_Journald.reg || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus register \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus register \
         %{_datadir}/%{name}/90_LMI_Journald_Profile.mof || :;
 fi >> %logfile 2>&1
 %endif
@@ -1104,7 +1112,7 @@ if [ "$1" -eq 0 ]; then
     %{_bindir}/openlmi-mof-register -v %{providers_version} unregister \
         %{_datadir}/%{name}/60_LMI_Fan.mof \
         %{_datadir}/%{name}/60_LMI_Fan.reg || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus unregister \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus unregister \
         %{_datadir}/%{name}/90_LMI_Fan_Profile.mof || :;
 fi >> %logfile 2>&1
 %endif
@@ -1114,7 +1122,7 @@ if [ "$1" -eq 0 ]; then
     %{_bindir}/openlmi-mof-register -v %{providers_version} unregister \
         %{_datadir}/%{name}/60_LMI_PowerManagement.mof \
         %{_datadir}/%{name}/60_LMI_PowerManagement.reg || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus unregister \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus unregister \
         %{_datadir}/%{name}/90_LMI_PowerManagement_Profile.mof || :;
 fi >> %logfile 2>&1
 
@@ -1123,7 +1131,7 @@ if [ "$1" -eq 0 ]; then
     %{_bindir}/openlmi-mof-register -v %{providers_version} unregister \
         %{_datadir}/%{name}/60_LMI_Service.mof \
         %{_datadir}/%{name}/60_LMI_Service.reg || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus unregister \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus unregister \
         %{_datadir}/%{name}/90_LMI_Service_Profile.mof || :;
 fi >> %logfile 2>&1
 
@@ -1133,7 +1141,7 @@ if [ "$1" -eq 0 ]; then
     %{_bindir}/openlmi-mof-register -v %{providers_version} unregister \
         %{_datadir}/%{name}/60_LMI_Account.mof \
         %{_datadir}/%{name}/60_LMI_Account.reg || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus unregister \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus unregister \
         %{_datadir}/%{name}/90_LMI_Account_Profile.mof || :;
 fi >> %logfile 2>&1
 %endif
@@ -1141,9 +1149,11 @@ fi >> %logfile 2>&1
 %preun -n openlmi-software
 if [ "$1" -eq 0 ]; then
     # delete indication filters
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop unregister \
+    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c sfcbd unregister \
         %{_datadir}/%{name}/70_LMI_SoftwareIndicationFilters.mof || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus unregister \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus unregister \
+        %{_datadir}/%{name}/70_LMI_SoftwareIndicationFilters.mof || :;
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus unregister \
         %{_datadir}/%{name}/90_LMI_Software_Profile.mof || :;
     %{_bindir}/openlmi-mof-register --just-mofs -c tog-pegasus unregister \
         %{_datadir}/%{name}/60_LMI_Software_MethodParameters.mof || :;
@@ -1157,7 +1167,7 @@ if [ "$1" -eq 0 ]; then
     %{_bindir}/openlmi-mof-register -v %{providers_version} unregister \
         %{_datadir}/%{name}/60_LMI_LogicalFile.mof \
         %{_datadir}/%{name}/60_LMI_LogicalFile.reg || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus unregister \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus unregister \
         %{_datadir}/%{name}/90_LMI_LogicalFile_Profile.mof || :;
 fi >> %logfile 2>&1
 
@@ -1167,7 +1177,7 @@ if [ "$1" -eq 0 ]; then
     %{_bindir}/openlmi-mof-register -v %{providers_version} unregister \
         %{_datadir}/%{name}/60_LMI_Realmd.mof \
         %{_datadir}/%{name}/60_LMI_Realmd.reg || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus unregister \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus unregister \
         %{_datadir}/%{name}/90_LMI_Realmd_Profile.mof || :;
 fi >> %logfile 2>&1
 %endif
@@ -1177,7 +1187,7 @@ if [ "$1" -eq 0 ]; then
     %{_bindir}/openlmi-mof-register -v %{providers_version} unregister \
         %{_datadir}/%{name}/60_LMI_Hardware.mof \
         %{_datadir}/%{name}/60_LMI_Hardware.reg || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus unregister \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus unregister \
         %{_datadir}/%{name}/90_LMI_Hardware_Profile.mof \
         %{_datadir}/%{name}/90_LMI_Hardware_Profile_DMTF.mof || :;
 fi >> %logfile 2>&1
@@ -1201,12 +1211,15 @@ if [ "$1" -eq 0 ]; then
     %{_bindir}/openlmi-mof-register -v %{providers_version} unregister \
         %{_datadir}/%{name}/60_LMI_Journald.mof \
         %{_datadir}/%{name}/60_LMI_Journald.reg || :;
-    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus unregister \
+    %{_bindir}/openlmi-mof-register --just-mofs -n %{interop} -c tog-pegasus unregister \
         %{_datadir}/%{name}/90_LMI_Journald_Profile.mof || :;
 fi >> %logfile 2>&1
 %endif
 
 %changelog
+* Tue May 20 2014 Radek Novacek <rnovacek@redhat.com> - 0.4.2-10
+- Use PG_InterOp on RHEL-6 with tog-pegasus
+
 * Thu May 15 2014 Radek Novacek <rnovacek@redhat.com> - 0.4.2-9
 - Use python2.6 as a provider location in .reg file