From 5bb1965c97593049fd47a6154c5c2eaae5345d79d71dc933d856df24adca72c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.com>
Date: Wed, 19 Mar 2014 14:06:37 +0000
Subject: [PATCH] Accepting request 226604 from
 home:aeszter:branches:systemsmanagement

- fix build for RHEL
  * MySQL connector: disabled
  * docs go into versioned directory

OBS-URL: https://build.opensuse.org/request/show/226604
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=75
---
 cfengine.changes | 7 +++++++
 cfengine.spec    | 8 +++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/cfengine.changes b/cfengine.changes
index 6696f1b..2595c66 100644
--- a/cfengine.changes
+++ b/cfengine.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar 18 10:20:55 UTC 2014 - aeszter@gwdg.de
+
+- fix build for RHEL 
+  * MySQL connector: disabled
+  * docs go into versioned directory
+
 -------------------------------------------------------------------
 Thu Feb 20 23:54:22 UTC 2014 - chris@computersalat.de
 
diff --git a/cfengine.spec b/cfengine.spec
index 1336e0d..39f3119 100644
--- a/cfengine.spec
+++ b/cfengine.spec
@@ -85,7 +85,7 @@ BuildRequires:  pam-devel
 #   library or disable MySQL connector. See
 #   http://bugs.mysql.com/bug.php?id=65055 for details.
 #
-%if 0%{?suse_version} != 1110
+%if 0%{?suse_version} != 1110 && 0%{?rhel_version} == 0
 BuildRequires:  mysql-devel
 %endif
 BuildRequires:  libacl-devel
@@ -213,7 +213,7 @@ CC=gcc CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
   --datadir=/var \
   --with-workdir=%{workdir} \
   --with-postgresql \
-%if 0%{?suse_version} != 1110
+%if 0%{?suse_version} != 1110 && 0%{?rhel_version} == 0
   --with-mysql \
 %endif
   --without-qdbm \
@@ -225,8 +225,10 @@ CC=gcc CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
   --with-libvirt \
   --with-libacl \
   --with-libxml2 \
-%if 0%{?suse_version} >= 1110 || 0%{?rhel_version} >= 600
+%if 0%{?suse_version} >= 1110 
   --docdir=%{_docdir}/%{name}
+%else if 0%{?rhel_version} >= 600
+  --docdir=%{_docdir}/%{name}-%{version}
 %endif
 # SLE 10 and RHEL5 don't recognize --docdir