From 4cb462a1530d52ec18955cddd0761c2d0e4c6823 Mon Sep 17 00:00:00 2001
From: Klaus Kaempf <kkaempf@suse.de>
Date: Mon, 6 Jan 2014 10:45:47 +0100
Subject: spec: %cmake in SUSE creates build subdir

The spec %cmake macro creates a build sub directory, conflicting with
Fedora's %cmake.

This patch introduces a target_builddir macro which equals
%{_target_platform}/build for SUSE and %{_target_platform} else.
---
 openlmi-providers.spec | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'openlmi-providers.spec')

diff --git a/openlmi-providers.spec b/openlmi-providers.spec
index 23b9d1f..c133947 100644
--- a/openlmi-providers.spec
+++ b/openlmi-providers.spec
@@ -443,12 +443,23 @@ This package contains the documents for OpenLMI Journald provider.
 %setup -q
 
 %build
+%if 0%{?suse_version}
+# SUSE %cmake creates build/ subdir
+%define target_builddir %{_target_platform}/build
+%else
+%define target_builddir %{_target_platform}
+%endif
+
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
+%if 0%{?suse_version}
+%{cmake} ../..
+%else
 %{cmake} ..
+%endif
 popd
 
-make -k %{?_smp_mflags} -C %{_target_platform} all doc
+make -k %{?_smp_mflags} -C %{target_builddir} all doc
 
 pushd src/python
 %{__python} setup.py build
@@ -462,7 +473,7 @@ pushd src/pcp
 popd
 
 %install
-make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{target_builddir}
 
 # The log file must be created
 mkdir -p "$RPM_BUILD_ROOT/%{_localstatedir}/log"
@@ -495,7 +506,7 @@ popd # src/software
 pushd src/pcp
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 popd
-cp -p %{_target_platform}/src/pcp/openlmi-pcp-generate $RPM_BUILD_ROOT/%{_bindir}/openlmi-pcp-generate
+cp -p %{target_builddir}/src/pcp/openlmi-pcp-generate $RPM_BUILD_ROOT/%{_bindir}/openlmi-pcp-generate
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily
 cp -p src/pcp/openlmi-pcp.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/openlmi-pcp
 sed -i -e 's,^_LOCALSTATEDIR=.*,_LOCALSTATEDIR="%{_localstatedir}",' \
@@ -514,10 +525,10 @@ install -m 755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}
 install -m 644 README COPYING $RPM_BUILD_ROOT/%{_docdir}/%{name}
 for provider in account fan hardware journald logicalfile power realmd software; do
     install -m 755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}/${provider}/admin_guide
-    cp -pr %{_target_platform}/doc/admin/${provider}/html/* $RPM_BUILD_ROOT/%{_docdir}/%{name}/${provider}/admin_guide
+    cp -pr %{target_builddir}/doc/admin/${provider}/html/* $RPM_BUILD_ROOT/%{_docdir}/%{name}/${provider}/admin_guide
 done
 install -m 755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}/service/admin_guide
-cp -pr %{_target_platform}/doc/admin/service-dbus/html/* $RPM_BUILD_ROOT/%{_docdir}/%{name}/service/admin_guide
+cp -pr %{target_builddir}/doc/admin/service-dbus/html/* $RPM_BUILD_ROOT/%{_docdir}/%{name}/service/admin_guide
 
 # sphinx theme
 install -m 755 -d $RPM_BUILD_ROOT/%{python_sitelib}/sphinx/themes/openlmitheme
-- 
cgit