From 60e05d5c8a6898864da33d4f182c24e7cfeae07e Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Tue, 15 Apr 2014 16:06:27 +0200
Subject: Disable the openlmi-devassistant subpackage on rhel

RHEL 7.0 comes with a rather old devassistant package version than we require
so let's disable DevAssistant support for OpenLMI temporarily.
---
 openlmi-providers.spec | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/openlmi-providers.spec b/openlmi-providers.spec
index 1b5ea25..ed0c91f 100644
--- a/openlmi-providers.spec
+++ b/openlmi-providers.spec
@@ -4,7 +4,7 @@
 
 Name:           openlmi-providers
 Version:        0.4.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Set of basic CIM providers
 
 %if 0%{?suse_version}
@@ -446,6 +446,7 @@ BuildArch:      noarch
 %description -n openlmi-journald-doc
 This package contains the documents for OpenLMI Journald provider.
 
+%if ! 0%{?rhel}
 %package -n openlmi-devassistant
 Summary:        OpenLMI provider templates for Developer Assistant
 BuildArch:      noarch
@@ -454,6 +455,7 @@ Requires:       %{name}-devel%{?_isa} = %{providers_version_release}
 
 %description -n openlmi-devassistant
 This package contains template files for Developer Assistant.
+%endif
 
 %prep
 %setup -q
@@ -468,10 +470,16 @@ This package contains template files for Developer Assistant.
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
+%if ! 0%{?rhel}
+%define _cmake_da -DWITH-DEVASSISTANT=ON
+%else
+%define _cmake_da -DWITH-DEVASSISTANT=OFF
+%endif
+
 %if 0%{?suse_version}
-%{cmake} ../.. -DWITH-DEVASSISTANT=ON
+%{cmake} ../.. %{_cmake_da}
 %else
-%{cmake} .. -DWITH-DEVASSISTANT=ON
+%{cmake} .. %{_cmake_da}
 %endif
 popd
 
@@ -737,10 +745,12 @@ cp -pr tools/openlmitheme/* $RPM_BUILD_ROOT/%{python_sitelib}/sphinx/themes/open
 %files -n openlmi-journald-doc
 %{_docdir}/%{name}/journald/
 
+%if ! 0%{?rhel}
 %files -n openlmi-devassistant
 %dir %{_datadir}/devassistant/files/crt/python/openlmi/
 %dir %{_datadir}/devassistant/files/crt/c/openlmi/
 %{_datadir}/devassistant/
+%endif
 
 %pre
 # If upgrading, deregister old version
@@ -1058,6 +1068,9 @@ if [ "$1" -eq 0 ]; then
 fi >> %logfile 2>&1
 
 %changelog
+* Mon Apr 14 2014 Tomas Bzatek <tbzatek@redhat.com> 0.4.2-4
+- Disable the openlmi-devassistant subpackage on rhel
+
 * Mon Feb 24 2014 Tomas Bzatek <tbzatek@redhat.com> 0.4.2-3
 - Added openlmi-devassistant subpackage
 
-- 
cgit