libopenlmi: rename back to openlmicommon and get versioning right

13 files changed, 26 insertions, 23 deletions

diff --git a/openlmi-providers.spec b/openlmi-providers.spec
index 9a21e6e..3489dae 100644
--- a/openlmi-providers.spec
+++ b/openlmi-providers.spec
@@ -4,7 +4,7 @@
 
 Name:           openlmi-providers
 Version:        0.4.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Set of basic CIM providers
 
 %if 0%{?suse_version}
@@ -569,7 +569,7 @@ cp -pr tools/openlmitheme/* $RPM_BUILD_ROOT/%{python_sitelib}/sphinx/themes/open
 %config(noreplace) %{_sysconfdir}/openlmi/openlmi.conf
 %{_datadir}/%{name}/05_LMI_Qualifiers.mof
 %{_datadir}/%{name}/30_LMI_Jobs.mof
-%{_libdir}/libopenlmi.so.*
+%{_libdir}/libopenlmicommon.so.*
 %attr(755, root, root) %{_bindir}/openlmi-mof-register
 %ghost %logfile
 %dir %{_sharedstatedir}/openlmi-registration
@@ -581,7 +581,7 @@ cp -pr tools/openlmitheme/* $RPM_BUILD_ROOT/%{python_sitelib}/sphinx/themes/open
 %doc README COPYING
 %{_bindir}/openlmi-doc-class2rst
 %{_bindir}/openlmi-doc-class2uml
-%{_libdir}/libopenlmi.so
+%{_libdir}/libopenlmicommon.so
 %{_libdir}/pkgconfig/openlmi.pc
 %dir %{_includedir}/openlmi
 %{_includedir}/openlmi/openlmi.h
@@ -1068,6 +1068,9 @@ if [ "$1" -eq 0 ]; then
 fi >> %logfile 2>&1
 
 %changelog
+* Tue May  6 2014 Jan Synáček <jsynacek@redhat.com> - 0.4.2-6
+- Change openlmi.so* back to openlmicommon.so*
+
 * Wed Apr 30 2014 Jan Synáček <jsynacek@redhat.com> - 0.4.2-5
 - Change openlmicommon.so* to openlmi.so*
 
diff --git a/src/account/CMakeLists.txt b/src/account/CMakeLists.txt
index 09a4322..83ca474 100644
--- a/src/account/CMakeLists.txt
+++ b/src/account/CMakeLists.txt
@@ -46,7 +46,7 @@ pkg_check_modules(LIBUSER REQUIRED libuser>=0.60)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMPI_INCLUDE_DIR} ${GLIB_INCLUDE_DIRS} ${LIBUSER_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/src/indmanager)
 
-target_link_libraries(${LIBRARY_NAME} openlmi ${KONKRETCMPI_LIBRARIES} ${GLIB_LIBRARIES} ${LIBUSER_LIBRARIES} openlmiindmanager)
+target_link_libraries(${LIBRARY_NAME} openlmicommon ${KONKRETCMPI_LIBRARIES} ${GLIB_LIBRARIES} ${LIBUSER_LIBRARIES} openlmiindmanager)
 
 # Create registration file
 cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers)
diff --git a/src/fan/CMakeLists.txt b/src/fan/CMakeLists.txt
index 6ccccbb..446e38b 100644
--- a/src/fan/CMakeLists.txt
+++ b/src/fan/CMakeLists.txt
@@ -25,7 +25,7 @@ add_library(${LIBRARY_NAME} SHARED
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMPI_INCLUDE_DIR})
 
-target_link_libraries(${LIBRARY_NAME} openlmi ${KONKRETCMPI_LIBRARIES} sensors)
+target_link_libraries(${LIBRARY_NAME} openlmicommon ${KONKRETCMPI_LIBRARIES} sensors)
 
 # Create registration file
 cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers)
diff --git a/src/hardware/CMakeLists.txt b/src/hardware/CMakeLists.txt
index ce7a06a..29b63d3 100644
--- a/src/hardware/CMakeLists.txt
+++ b/src/hardware/CMakeLists.txt
@@ -31,7 +31,7 @@ add_library(${LIBRARY_NAME} SHARED
 pkg_check_modules(LIBPCI REQUIRED libpci)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMPI_INCLUDE_DIR} ${LIBPCI_INCLUDE_DIR})
-target_link_libraries(${LIBRARY_NAME} m openlmi ${KONKRETCMPI_LIBRARIES} ${LIBPCI_LIBRARIES})
+target_link_libraries(${LIBRARY_NAME} m openlmicommon ${KONKRETCMPI_LIBRARIES} ${LIBPCI_LIBRARIES})
 
 # Create registration file
 cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers)
diff --git a/src/journald/CMakeLists.txt b/src/journald/CMakeLists.txt
index 029f3f0..1e6f193 100644
--- a/src/journald/CMakeLists.txt
+++ b/src/journald/CMakeLists.txt
@@ -34,7 +34,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}
                     )
 
 target_link_libraries(${LIBRARY_NAME}
-                      openlmi
+                      openlmicommon
                       openlmiindmanager
                       ${KONKRETCMPI_LIBRARIES}
                       ${GLIB2_LIBRARIES}
diff --git a/src/libs/libopenlmi/CMakeLists.txt b/src/libs/libopenlmi/CMakeLists.txt
index 8540323..85decbe 100644
--- a/src/libs/libopenlmi/CMakeLists.txt
+++ b/src/libs/libopenlmi/CMakeLists.txt
@@ -2,23 +2,23 @@
 # the version numbers, see libtool manual.
 # https://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
 # https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-set(OPENLMI_VERSION_CURRENT 1)
-set(OPENLMI_VERSION_REVISION 0)
-set(OPENLMI_VERSION_AGE 2)
-set(OPENLMI_VERSION "${OPENLMI_VERSION_CURRENT}.${OPENLMI_VERSION_REVISION}.${OPENLMI_VERSION_AGE}")
+set(OPENLMICOMMON_VERSION_CURRENT 1)
+set(OPENLMICOMMON_VERSION_REVISION 0)
+set(OPENLMICOMMON_VERSION_AGE 0)
+set(OPENLMICOMMON_VERSION "${OPENLMICOMMON_VERSION_CURRENT}.${OPENLMICOMMON_VERSION_REVISION}.${OPENLMICOMMON_VERSION_AGE}")
 
 configure_file(openlmi.pc.in ${CMAKE_CURRENT_BINARY_DIR}/openlmi.pc @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openlmi.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
 install(FILES openlmi.conf DESTINATION ${SYSCONF_INSTALL_DIR}/openlmi)
 
-add_library(openlmi SHARED
+add_library(openlmicommon SHARED
             openlmi.c
 )
 
-target_link_libraries(openlmi ${GLIB_LIBRARIES} dl)
+target_link_libraries(openlmicommon ${GLIB_LIBRARIES} dl)
 
-set_target_properties(openlmi PROPERTIES VERSION ${OPENLMI_VERSION})
-set_target_properties(openlmi PROPERTIES SOVERSION ${OPENLMI_VERSION_CURRENT})
+set_target_properties(openlmicommon PROPERTIES VERSION ${OPENLMICOMMON_VERSION})
+set_target_properties(openlmicommon PROPERTIES SOVERSION ${OPENLMICOMMON_VERSION_CURRENT})
 
-install(TARGETS openlmi DESTINATION lib${LIB_SUFFIX})
+install(TARGETS openlmicommon DESTINATION lib${LIB_SUFFIX})
 install(FILES openlmi.h DESTINATION include/openlmi)
diff --git a/src/libs/libopenlmi/openlmi.pc.in b/src/libs/libopenlmi/openlmi.pc.in
index 5824e73..939d672 100644
--- a/src/libs/libopenlmi/openlmi.pc.in
+++ b/src/libs/libopenlmi/openlmi.pc.in
@@ -6,5 +6,5 @@ libdir=${exec_prefix}/lib@LIB_SUFFIX@
 Name: openlmi
 Description: OpenLMI provider support
 Version: @OPENLMICOMMON_VERSION@
-Libs: -L${libdir} -lopenlmi
+Libs: -L${libdir} -lopenlmicommon
 CFlags: -I${includedir}/openlmi
diff --git a/src/logicalfile/CMakeLists.txt b/src/logicalfile/CMakeLists.txt
index 4e7e8fa..3a09a4a 100644
--- a/src/logicalfile/CMakeLists.txt
+++ b/src/logicalfile/CMakeLists.txt
@@ -27,7 +27,7 @@ if(LIBSELINUX_FOUND EQUAL 1)
 endif(LIBSELINUX_FOUND EQUAL 1)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMPI_INCLUDE_DIR})
-target_link_libraries(${LIBRARY_NAME} openlmi
+target_link_libraries(${LIBRARY_NAME} openlmicommon
                       ${KONKRETCMPI_LIBRARIES}
                       ${LIBUDEV_LIBRARIES}
                       ${LIBSELINUX_LIBRARIES})
diff --git a/src/power/CMakeLists.txt b/src/power/CMakeLists.txt
index 0519c4a..44b2109 100644
--- a/src/power/CMakeLists.txt
+++ b/src/power/CMakeLists.txt
@@ -43,7 +43,7 @@ endif (${SYSTEMCTL_FOUND})
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMPI_INCLUDE_DIR} ${GLIB_INCLUDE_DIRS})
 
-target_link_libraries(${LIBRARY_NAME} openlmi ${KONKRETCMPI_LIBRARIES} ${GLIB_LIBRARIES})
+target_link_libraries(${LIBRARY_NAME} openlmicommon ${KONKRETCMPI_LIBRARIES} ${GLIB_LIBRARIES})
 
 # Create registration file
 cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers)
diff --git a/src/realmd/CMakeLists.txt b/src/realmd/CMakeLists.txt
index af4d1c2..dbf2e54 100644
--- a/src/realmd/CMakeLists.txt
+++ b/src/realmd/CMakeLists.txt
@@ -36,7 +36,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}
                     )
 
 target_link_libraries(${LIBRARY_NAME}
-                      openlmi
+                      openlmicommon
                       ${KONKRETCMPI_LIBRARIES}
                       ${DBUS1_LIBRARIES}
                       ${GLIB2_LIBRARIES}
diff --git a/src/service-dbus/CMakeLists.txt b/src/service-dbus/CMakeLists.txt
index b1c42f1..4ba3231 100644
--- a/src/service-dbus/CMakeLists.txt
+++ b/src/service-dbus/CMakeLists.txt
@@ -28,7 +28,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}
                     ${GIO_INCLUDE_DIRS}
                     ${CMAKE_SOURCE_DIR}/src/indmanager)
 target_link_libraries(${LIBRARY_NAME}
-                      openlmi
+                      openlmicommon
                       openlmiindmanager
                       ${KONKRETCMPI_LIBRARIES}
                       ${GIO_LIBRARIES})
diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt
index aa2c6e2..6d75d38 100644
--- a/src/service/CMakeLists.txt
+++ b/src/service/CMakeLists.txt
@@ -21,7 +21,7 @@ add_library(${LIBRARY_NAME} SHARED
 )
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMPI_INCLUDE_DIR})
-target_link_libraries(${LIBRARY_NAME} openlmi ${KONKRETCMPI_LIBRARIES})
+target_link_libraries(${LIBRARY_NAME} openlmicommon ${KONKRETCMPI_LIBRARIES})
 
 # Create registration file
 cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers)
diff --git a/src/software-dbus/CMakeLists.txt b/src/software-dbus/CMakeLists.txt
index 050df9c..5202c33 100644
--- a/src/software-dbus/CMakeLists.txt
+++ b/src/software-dbus/CMakeLists.txt
@@ -27,7 +27,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}
                     ${CMPI_INCLUDE_DIR}
                     ${PACKAGEKIT_INCLUDE_DIRS})
 target_link_libraries(${LIBRARY_NAME}
-                      openlmi
+                      openlmicommon
                       ${KONKRETCMPI_LIBRARIES}
                       ${PACKAGEKIT_LIBRARIES})