From 8dc864becb7856e6bbcc5d5996ecc1688d9059d4e7443fa531ad63566db3f631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Thu, 18 Jun 2015 07:37:41 +0000 Subject: [PATCH] - fix Fedora/RHEL builds OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/freeipmi?expand=0&rev=66 --- freeipmi.changes | 5 +++++ freeipmi.spec | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/freeipmi.changes b/freeipmi.changes index 6b90e89..69e1c20 100644 --- a/freeipmi.changes +++ b/freeipmi.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 18 07:37:27 UTC 2015 - kkaempf@suse.com + +- fix Fedora/RHEL builds + ------------------------------------------------------------------- Tue Jun 2 10:53:50 UTC 2015 - kkaempf@suse.com diff --git a/freeipmi.spec b/freeipmi.spec index 900a2a6..7e8ce3e 100644 --- a/freeipmi.spec +++ b/freeipmi.spec @@ -52,6 +52,9 @@ BuildRequires: fdupes %if 0%{?suse_version} >=1230 BuildRequires: pkgconfig(systemd) %endif +%if 0%{?fedora_version} == 20 || 0%{?rhel_version} >= 700 +BuildRequires: perl-Exporter +%endif Obsoletes: freeipmi-ipmimonitoring < %{version} Provides: freeipmi-ipmimonitoring = %{version} @@ -124,7 +127,7 @@ libtoolize --force --automake --copy autoconf automake --gnu --include-deps --copy --add-missing %endif -%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} +%if (0%{?fedora_version} > 0 && 0%{?fedora_version} < 21) || 0%{?centos_version} || 0%{?rhel_version} %define docpath %{_docdir}/%{name}-%{version} %else %define docpath %{_docdir}/%{name} @@ -324,9 +327,9 @@ fi %doc doc/freeipmi-libraries.txt %doc doc/freeipmi-bugs-issues-and-workarounds.txt #%dir %{_docdir} -#%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} -#%{_docdir} -#%endif +%if 0%{?fedora_version} == 20 +%{docpath} +%endif %config %{_sysconfdir}/freeipmi/ipmiseld.conf %if 0%{?suse_version} >=1230 %{_unitdir}/ipmiseld.service