[openlmi-providers] Added explicit dependency on new libuser release

[Tomas Bzatek]

commit 0d0c94b334b7078646ae3f52ad76ebe43fb1e4c3
Author: Tomas Bzatek <tbzatek at redhat.com>
Date:   Wed Nov 6 18:03:10 2013 +0100

    Added explicit dependency on new libuser release

 openlmi-providers-0.4.2-require-libuser-0.60.patch |   28 ++++++++++++++++++++
 openlmi-providers.spec                             |   13 ++++++++-
 2 files changed, 39 insertions(+), 2 deletions(-)
---
diff --git a/openlmi-providers-0.4.2-require-libuser-0.60.patch b/openlmi-providers-0.4.2-require-libuser-0.60.patch
new file mode 100644
index 0000000..cf07dee
--- /dev/null
+++ b/openlmi-providers-0.4.2-require-libuser-0.60.patch
@@ -0,0 +1,28 @@
+From 352985f9a617b61fbe879e38f72663b6b7771450 Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek at redhat.com>
+Date: Wed, 6 Nov 2013 17:37:01 +0100
+Subject: [PATCH] Require libuser >= 0.60
+
+The commit aac4d3a0d1dc brought new symbols in the code without bumping
+libuser version req.
+---
+ openlmi-providers.spec     | 9 +++++++--
+ src/account/CMakeLists.txt | 2 +-
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/account/CMakeLists.txt b/src/account/CMakeLists.txt
+index 021b5f2..0fdba1f 100644
+--- a/src/account/CMakeLists.txt
++++ b/src/account/CMakeLists.txt
+@@ -42,7 +42,7 @@ set(TARGET_MOF "${CMAKE_BINARY_DIR}/mof/90_LMI_Account_Profile.mof")
+ profile_mof_generate("90_LMI_Account_Profile.mof.skel" "${TARGET_MOF}" "${CIM_PROVIDERS_CLASSES}")
+ 
+ # Require libuser
+-pkg_check_modules(LIBUSER REQUIRED libuser)
++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)
+ 
+-- 
+1.8.4.2
+
diff --git a/openlmi-providers.spec b/openlmi-providers.spec
index 2cfb96d..0e251c1 100644
--- a/openlmi-providers.spec
+++ b/openlmi-providers.spec
@@ -1,9 +1,10 @@
 %global logfile %{_localstatedir}/log/openlmi-install.log
 %global required_konkret_ver 0.9.0-2
+%global required_libuser_ver 0.60
 
 Name:           openlmi-providers
 Version:        0.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Set of basic CIM providers
 
 License:        LGPLv2+
@@ -21,7 +22,7 @@ BuildRequires:  cim-schema
 # For openlmi-fan
 BuildRequires:  lm_sensors-devel
 # For openlmi-account
-BuildRequires:  libuser-devel
+BuildRequires:  libuser-devel >= %{required_libuser_ver}
 BuildRequires:  python2-devel
 # for openlmi-*-doc packages
 BuildRequires:  konkretcmpi-python >= %{required_konkret_ver}
@@ -54,6 +55,9 @@ Requires:       cim-schema
 # Remove in future
 BuildRequires:  python-setuptools
 
+# from upstream
+Patch0:        openlmi-providers-0.4.2-require-libuser-0.60.patch
+
 %description
 %{name} is set of (usually) small CMPI providers (agents) for basic
 monitoring and management of host system using Common Information
@@ -124,6 +128,7 @@ This package contains the documents for OpenLMI service provider.
 Summary:        CIM provider for managing accounts on system
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       openlmi-indicationmanager-libs%{?_isa} = %{version}-%{release}
+Requires:       libuser >= %{required_libuser_ver}
 Provides:       cura-account = %{version}-%{release}
 Obsoletes:      cura-account < 0.0.10-1
 
@@ -315,6 +320,7 @@ This package contains the documents for OpenLMI Journald provider.
 
 %prep
 %setup -q
+%patch0 -p1 -b .libuser-require
 
 %build
 mkdir -p %{_target_platform}
@@ -887,6 +893,9 @@ if [ "$1" -eq 0 ]; then
 fi >> %logfile 2>&1
 
 %changelog
+* Wed Nov  6 2013 Tomas Bzatek <tbzatek at redhat.com> 0.4.1-2
+- Added explicit dependency on new libuser release
+
 * Mon Nov  4 2013 Jan Safranek <jsafrane at redhat.com>> 0.4.1-1
 - Version 0.4.1
 - Add powermanagement and hardware providers documentation