From 5e4d1ea25b66830c428f00f6a9db3b650dcd1696 Mon Sep 17 00:00:00 2001
From: Radek Novacek <rnovacek@redhat.com>
Date: Thu, 25 Jul 2013 11:49:39 +0200
Subject: Add version to mof/reg registration

Both (un)register-$PROVIDER and specfile are updated to use version
during register/unregister.

Version of OpenLMI-Providers *MUST* be kept up-to-date in top level
CMakeLists.txt.
---
 CMakeLists.txt                    |  5 ++++
 cmake/modules/OpenLMIMacros.cmake |  5 ++--
 openlmi-providers.spec            | 60 +++++++++++++++++++++------------------
 3 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 834ffa5..ed4fd27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,11 @@
 
 project(openlmi-providers C)
 
+set(OPENLMI_VERSION_MAJOR 0)
+set(OPENLMI_VERSION_MINOR 0)
+set(OPENLMI_VERSION_REVISION 25)
+set(OPENLMI_VERSION "${OPENLMI_VERSION_MAJOR}.${OPENLMI_VERSION_MINOR}.${OPENLMI_VERSION_REVISION}")
+
 cmake_minimum_required(VERSION 2.6)
 
 # Set flags and definitions
diff --git a/cmake/modules/OpenLMIMacros.cmake b/cmake/modules/OpenLMIMacros.cmake
index 4eeb994..18a265e 100644
--- a/cmake/modules/OpenLMIMacros.cmake
+++ b/cmake/modules/OpenLMIMacros.cmake
@@ -148,11 +148,12 @@ macro(cim_registration PROVIDER_NAME LIBRARY_NAME MOF DEST)
               openlmi-mof-register
               PATHS ${CMAKE_SOURCE_DIR}
               /usr/bin
+              NO_DEFAULT_PATH
     )
     add_custom_target(register-${PROVIDER_NAME}
-                      ${OPENLMI_MOF_REGISTER} register ${MOF_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${REG})
+                      ${OPENLMI_MOF_REGISTER} -v ${OPENLMI_VERSION} register ${MOF_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${REG})
     add_custom_target(unregister-${PROVIDER_NAME}
-                      ${OPENLMI_MOF_REGISTER} unregister ${MOF_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${REG})
+                      ${OPENLMI_MOF_REGISTER} -v ${OPENLMI_VERSION} unregister ${MOF_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${REG})
 endmacro(cim_registration)
 
 
diff --git a/openlmi-providers.spec b/openlmi-providers.spec
index 27e5769..9872d2c 100644
--- a/openlmi-providers.spec
+++ b/openlmi-providers.spec
@@ -1,6 +1,6 @@
 Name:           openlmi-providers
 Version:        0.0.25
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Set of basic CIM providers
 
 License:        LGPLv2+
@@ -296,6 +296,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/%{name}
 %{_libdir}/cmpi/libcmpiLMI_Account.so
 %{_datadir}/%{name}/60_LMI_Account.mof
 %{_datadir}/%{name}/60_LMI_Account.reg
+%{_datadir}/%{name}/90_LMI_Account_Profile.mof
 %attr(755, root, root) %{_libexecdir}/pegasus/cmpiLMI_Account-cimprovagt
 
 %files -n openlmi-hardware
@@ -420,7 +421,7 @@ fi
 %pre -n openlmi-fan
 # If upgrading, deregister old version
 if [ "$1" -gt 1 ]; then
-    %{_bindir}/openlmi-mof-register unregister \
+    %{_bindir}/openlmi-mof-register -v %{version} unregister \
         %{_datadir}/%{name}/60_LMI_Fan.mof \
         %{_datadir}/%{name}/60_LMI_Fan.reg \
         > /dev/null 2>&1 || :;
@@ -428,7 +429,7 @@ fi
 
 %pre -n openlmi-powermanagement
 if [ "$1" -gt 1 ]; then
-    %{_bindir}/openlmi-mof-register unregister \
+    %{_bindir}/openlmi-mof-register -v %{version} unregister \
         %{_datadir}/%{name}/60_LMI_PowerManagement.mof \
         %{_datadir}/%{name}/60_LMI_PowerManagement.reg \
         > /dev/null 2>&1 || :;
@@ -436,7 +437,7 @@ fi
 
 %pre -n openlmi-service
 if [ "$1" -gt 1 ]; then
-    %{_bindir}/openlmi-mof-register unregister \
+    %{_bindir}/openlmi-mof-register -v %{version} unregister \
         %{_datadir}/%{name}/60_LMI_Service.mof \
         %{_datadir}/%{name}/60_LMI_Service.reg \
         > /dev/null 2>&1 || :;
@@ -444,7 +445,7 @@ fi
 
 %pre -n openlmi-account
 if [ "$1" -gt 1 ]; then
-    %{_bindir}/openlmi-mof-register unregister \
+    %{_bindir}/openlmi-mof-register -v %{version} unregister \
         %{_datadir}/%{name}/60_LMI_Account.mof \
         %{_datadir}/%{name}/60_LMI_Account.reg \
         > /dev/null 2>&1 || :;
@@ -462,7 +463,7 @@ if [ "$1" -gt 1 ]; then
         -c tog-pegasus unregister \
         %{_datadir}/%{name}/70_LMI_SoftwareIndicationFilters.mof \
         > /dev/null 2>&1 || :;
-    %{_bindir}/openlmi-mof-register unregister \
+    %{_bindir}/openlmi-mof-register -v %{version} unregister \
         %{_datadir}/%{name}/60_LMI_Software.mof \
         %{_datadir}/%{name}/LMI_Software.reg \
         > /dev/null 2>&1 || :;
@@ -470,7 +471,7 @@ fi
 
 %pre -n openlmi-logicalfile
 if [ "$1" -gt 1 ]; then
-    %{_bindir}/openlmi-mof-register unregister \
+    %{_bindir}/openlmi-mof-register -v %{version} unregister \
         %{_datadir}/%{name}/60_LMI_LogicalFile.mof \
         %{_datadir}/%{name}/60_LMI_LogicalFile.reg \
         > /dev/null 2>&1 || :;
@@ -478,7 +479,7 @@ fi
 
 %pre -n openlmi-realmd
 if [ "$1" -gt 1 ]; then
-    %{_bindir}/openlmi-mof-register unregister \
+    %{_bindir}/openlmi-mof-register -v %{version} unregister \
         %{_datadir}/%{name}/60_LMI_Realmd.mof \
         %{_datadir}/%{name}/60_LMI_Realmd.reg \
         > /dev/null 2>&1 || :;
@@ -487,7 +488,7 @@ fi
 
 %pre -n openlmi-hardware
 if [ "$1" -gt 1 ]; then
-    %{_bindir}/openlmi-mof-register unregister \
+    %{_bindir}/openlmi-mof-register -v %{version} unregister \
         %{_datadir}/%{name}/60_LMI_Hardware.mof \
         %{_datadir}/%{name}/60_LMI_Hardware.reg \
         > /dev/null 2>&1 || :;
@@ -495,7 +496,7 @@ fi
 
 %pre -n openlmi-pcp
 if [ "$1" -gt 1 ]; then
-    %{_bindir}/openlmi-mof-register unregister \
+    %{_bindir}/openlmi-mof-register -v %{version} unregister \
         %{_datadir}/%{name}/60_LMI_PCP.mof \
         %{_localstatedir}/lib/%{name}/60_LMI_PCP_PMNS.mof \
         %{_localstatedir}/lib/%{name}/60_LMI_PCP_PMNS.reg \
@@ -505,7 +506,7 @@ fi
 %post -n openlmi-fan
 # Register Schema and Provider
 if [ "$1" -ge 1 ]; then
-    %{_bindir}/openlmi-mof-register register \
+    %{_bindir}/openlmi-mof-register -v %{version} register \
         %{_datadir}/%{name}/60_LMI_Fan.mof \
         %{_datadir}/%{name}/60_LMI_Fan.reg \
         > /dev/null 2>&1 || :;
@@ -513,7 +514,7 @@ fi
 
 %post -n openlmi-powermanagement
 if [ "$1" -ge 1 ]; then
-    %{_bindir}/openlmi-mof-register register \
+    %{_bindir}/openlmi-mof-register -v %{version} register \
         %{_datadir}/%{name}/60_LMI_PowerManagement.mof \
         %{_datadir}/%{name}/60_LMI_PowerManagement.reg \
         > /dev/null 2>&1 || :;
@@ -521,7 +522,7 @@ fi
 
 %post -n openlmi-service
 if [ "$1" -ge 1 ]; then
-    %{_bindir}/openlmi-mof-register register \
+    %{_bindir}/openlmi-mof-register -v %{version} register \
         %{_datadir}/%{name}/60_LMI_Service.mof \
         %{_datadir}/%{name}/60_LMI_Service.reg \
         > /dev/null 2>&1 || :;
@@ -529,7 +530,7 @@ fi
 
 %post -n openlmi-account
 if [ "$1" -ge 1 ]; then
-    %{_bindir}/openlmi-mof-register register \
+    %{_bindir}/openlmi-mof-register -v %{version} register \
         %{_datadir}/%{name}/60_LMI_Account.mof \
         %{_datadir}/%{name}/60_LMI_Account.reg \
         > /dev/null 2>&1 || :;
@@ -537,7 +538,7 @@ fi
 
 %post -n openlmi-software
 if [ "$1" -ge 1 ]; then
-    %{_bindir}/openlmi-mof-register register \
+    %{_bindir}/openlmi-mof-register -v %{version} register \
         %{_datadir}/%{name}/60_LMI_Software.mof \
         %{_datadir}/%{name}/LMI_Software.reg \
         > /dev/null 2>&1 || :;
@@ -555,7 +556,7 @@ fi
 
 %post -n openlmi-logicalfile
 if [ "$1" -gt 1 ]; then
-    %{_bindir}/openlmi-mof-register register \
+    %{_bindir}/openlmi-mof-register -v %{version} register \
         %{_datadir}/%{name}/60_LMI_LogicalFile.mof \
         %{_datadir}/%{name}/60_LMI_LogicalFile.reg \
         > /dev/null 2>&1 || :;
@@ -563,7 +564,7 @@ fi
 
 %post -n openlmi-realmd
 if [ "$1" -gt 1 ]; then
-    %{_bindir}/openlmi-mof-register register \
+    %{_bindir}/openlmi-mof-register -v %{version} register \
         %{_datadir}/%{name}/60_LMI_Realmd.mof \
         %{_datadir}/%{name}/60_LMI_Realmd.reg \
         > /dev/null 2>&1 || :;
@@ -571,7 +572,7 @@ fi
 
 %post -n openlmi-hardware
 if [ "$1" -gt 1 ]; then
-    %{_bindir}/openlmi-mof-register register \
+    %{_bindir}/openlmi-mof-register -v %{version} register \
         %{_datadir}/%{name}/60_LMI_Hardware.mof \
         %{_datadir}/%{name}/60_LMI_Hardware.reg \
         > /dev/null 2>&1 || :;
@@ -579,7 +580,7 @@ fi
 
 %post -n openlmi-pcp
 if [ "$1" -gt 1 ]; then
-    %{_bindir}/openlmi-mof-register register \
+    %{_bindir}/openlmi-mof-register -v %{version} register \
         %{_datadir}/%{name}/60_LMI_PCP.mof \
         %{_localstatedir}/lib/%{name}/60_LMI_PCP_PMNS.mof \
         %{_localstatedir}/lib/%{name}/60_LMI_PCP_PMNS.reg \
@@ -589,7 +590,7 @@ fi
 %preun -n openlmi-fan
 # Deregister only if not upgrading
 if [ "$1" -eq 0 ]; then
-    %{_bindir}/openlmi-mof-register unregister \
+    %{_bindir}/openlmi-mof-register -v %{version} unregister \
         %{_datadir}/%{name}/60_LMI_Fan.mof \
         %{_datadir}/%{name}/60_LMI_Fan.reg \
         > /dev/null 2>&1 || :;
@@ -597,7 +598,7 @@ fi
 
 %preun -n openlmi-powermanagement
 if [ "$1" -eq 0 ]; then
-    %{_bindir}/openlmi-mof-register unregister \
+    %{_bindir}/openlmi-mof-register -v %{version} unregister \
         %{_datadir}/%{name}/60_LMI_PowerManagement.mof \
         %{_datadir}/%{name}/60_LMI_PowerManagement.reg \
         > /dev/null 2>&1 || :;
@@ -605,7 +606,7 @@ fi
 
 %preun -n openlmi-service
 if [ "$1" -eq 0 ]; then
-    %{_bindir}/openlmi-mof-register unregister \
+    %{_bindir}/openlmi-mof-register -v %{version} unregister \
         %{_datadir}/%{name}/60_LMI_Service.mof \
         %{_datadir}/%{name}/60_LMI_Service.reg \
         > /dev/null 2>&1 || :;
@@ -613,7 +614,7 @@ fi
 
 %preun -n openlmi-account
 if [ "$1" -eq 0 ]; then
-    %{_bindir}/openlmi-mof-register unregister \
+    %{_bindir}/openlmi-mof-register -v %{version} unregister \
         %{_datadir}/%{name}/60_LMI_Account.mof \
         %{_datadir}/%{name}/60_LMI_Account.reg \
         > /dev/null 2>&1 || :;
@@ -631,7 +632,7 @@ if [ "$1" -eq 0 ]; then
         -c tog-pegasus unregister \
         %{_datadir}/%{name}/70_LMI_SoftwareIndicationFilters.mof \
         > /dev/null 2>&1 || :;
-    %{_bindir}/openlmi-mof-register unregister \
+    %{_bindir}/openlmi-mof-register -v %{version} unregister \
         %{_datadir}/%{name}/60_LMI_Software.mof \
         %{_datadir}/%{name}/LMI_Software.reg \
         > /dev/null 2>&1 || :;
@@ -639,7 +640,7 @@ fi
 
 %preun -n openlmi-logicalfile
 if [ "$1" -gt 1 ]; then
-    %{_bindir}/openlmi-mof-register unregister \
+    %{_bindir}/openlmi-mof-register -v %{version} unregister \
         %{_datadir}/%{name}/60_LMI_LogicalFile.mof \
         %{_datadir}/%{name}/60_LMI_LogicalFile.reg \
         > /dev/null 2>&1 || :;
@@ -647,7 +648,7 @@ fi
 
 %preun -n openlmi-realmd
 if [ "$1" -gt 1 ]; then
-    %{_bindir}/openlmi-mof-register unregister \
+    %{_bindir}/openlmi-mof-register -v %{version} unregister \
         %{_datadir}/%{name}/60_LMI_Realmd.mof \
         %{_datadir}/%{name}/60_LMI_Realmd.reg \
         > /dev/null 2>&1 || :;
@@ -655,7 +656,7 @@ fi
 
 %preun -n openlmi-hardware
 if [ "$1" -gt 1 ]; then
-    %{_bindir}/openlmi-mof-register unregister \
+    %{_bindir}/openlmi-mof-register -v %{version} unregister \
         %{_datadir}/%{name}/60_LMI_Hardware.mof \
         %{_datadir}/%{name}/60_LMI_Hardware.reg \
         > /dev/null 2>&1 || :;
@@ -663,7 +664,7 @@ fi
 
 %preun -n openlmi-pcp
 if [ "$1" -gt 1 ]; then
-    %{_bindir}/openlmi-mof-register unregister \
+    %{_bindir}/openlmi-mof-register -v %{version} unregister \
         %{_datadir}/%{name}/60_LMI_PCP.mof \
         %{_localstatedir}/lib/%{name}/60_LMI_PCP_PMNS.mof \
         %{_localstatedir}/lib/%{name}/60_LMI_PCP_PMNS.reg \
@@ -671,6 +672,9 @@ if [ "$1" -gt 1 ]; then
 fi
 
 %changelog
+* Thu Jul 25 2013 Radek Novacek <rnovacek@redhat.com> - 0.0.25-8
+- Add version to mof/reg registration
+
 * Tue Jul 23 2013 Michal Minar <miminar@redhat.com> 0.0.25-7
 - Added configuration files for software.
 
-- 
cgit