From 3e2875e4b504ac51c0c8ce2b13e645bf3edcbee0e3c24b899583d41ebc2420ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Fri, 5 Oct 2012 12:43:48 +0000 Subject: [PATCH] fix SLE_11 build OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=22 --- cfengine.spec | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/cfengine.spec b/cfengine.spec index a7fb3c0..c41e636 100644 --- a/cfengine.spec +++ b/cfengine.spec @@ -52,7 +52,14 @@ BuildRequires: flex BuildRequires: libtokyocabinet-devel BuildRequires: libtool BuildRequires: libxml2-devel +# Disable mysql for SLE_11: +# configure: error: MySQL client library exports symbols clashing with +# OpenSSL. Get the update from distribution provider, recompile MySQL +# library or disable MySQL connector. See +# http://bugs.mysql.com/bug.php?id=65055 for details. +%if 0%{?suse_version} != 1110 BuildRequires: mysql-devel +%endif BuildRequires: openssl-devel BuildRequires: pcre-devel BuildRequires: postgresql-devel @@ -185,8 +192,8 @@ sed -i\ %endif # install docs -%{__install} -d %{buildroot}/%{_docdir}/%{name} -%{__install} -m 0644 %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{buildroot}/%{_docdir}/%{name} +%{__install} -d %{buildroot}/%{_datadir}/doc/%{name} +%{__install} -m 0644 %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{buildroot}/%{_datadir}/doc/%{name} # create symlinks for sbin_PROGRAMS # WHY ? @@ -308,7 +315,6 @@ rm -rf %{buildroot}/%{_datadir}/%{name}/README %doc LICENSE %doc README %doc ChangeLog -%exclude %{_docdir}/%{name}/*.pdf %{_sbindir}/cf-agent %{_sbindir}/cf-execd %{_sbindir}/cf-key @@ -322,6 +328,8 @@ rm -rf %{buildroot}/%{_datadir}/%{name}/README %else %exclude /etc/init.d/cf-serverd %config %attr(0755,root,root) /etc/init.d/* +%{_sbindir}/rccf-execd +%{_sbindir}/rccf-monitord %endif %{_mandir}/man?/* @@ -347,7 +355,6 @@ rm -rf %{buildroot}/%{_datadir}/%{name}/README %files doc %defattr(-,root,root) -%doc %{_docdir}/%{name}/*.pdf %dir %{_datadir}/doc/%{name} %{_datadir}/doc/%{name}/* @@ -359,9 +366,8 @@ rm -rf %{buildroot}/%{_datadir}/%{name}/README %if 0%{?suse_version} >= 1210 %_unitdir/cf-serverd.service %else -%{workdir}/bin/cf-serverd /etc/init.d/cf-serverd -/usr/sbin/rccf-serverd +%{_sbindir}/rccf-serverd %endif %changelog