rpms/sblim-gather
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix multilib conflicts

Browse Source
This commit is contained in:
Vitezslav Crhonek 2014-03-17 14:09:11 +01:00
parent f238a86c71
commit a8638b9575
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sblim-gather-2.2.8-multilib.patch Normal file
View File

@ -0,0 +1,26 @@
diff -up sblim-gather-2.2.8/man/gatherd.conf.5.xml.pre.in.orig sblim-gather-2.2.8/man/gatherd.conf.5.xml.pre.in
--- sblim-gather-2.2.8/man/gatherd.conf.5.xml.pre.in.orig 2013-02-12 02:08:25.000000000 +0100
+++ sblim-gather-2.2.8/man/gatherd.conf.5.xml.pre.in 2014-03-17 12:23:54.825349694 +0100
@@ -71,7 +71,8 @@ Valid components are: comm, util, gather
<term><option>PluginDirectory</option>=<replaceable>dir</replaceable></term>
<listitem>
<para>Directory where metric collection plugins are located. Default is
-<command>@libdir@/gather/mplug</command>.</para>
+<command>/usr/lib/gather/mplug</command>
+(<command>/usr/lib64/gather/mplug</command>).</para>
</listitem>
</varlistentry>
<varlistentry>
diff -up sblim-gather-2.2.8/man/reposd.conf.5.xml.pre.in.orig sblim-gather-2.2.8/man/reposd.conf.5.xml.pre.in
--- sblim-gather-2.2.8/man/reposd.conf.5.xml.pre.in.orig 2014-03-17 12:24:10.634427699 +0100
+++ sblim-gather-2.2.8/man/reposd.conf.5.xml.pre.in 2014-03-17 12:24:38.697566201 +0100
@@ -71,7 +71,8 @@ Valid components are: comm, util, repos.
<term><option>PluginDirectory</option>=<replaceable>dir</replaceable></term>
<listitem>
<para>Directory where repository metric plugins are located. Default is
-<command>@libdir@/gather/rplug</command>.</para>
+<command>/usr/lib/gather/rplug</command>
+(<command>/usr/lib64/gather/rplug</command>).</para>
</listitem>
</varlistentry>
<varlistentry>

8
sblim-gather.spec
View File

@ -4,7 +4,7 @@
Name: sblim-gather
Version: 2.2.8
Release: 5%{?dist}
Release: 6%{?dist}
Summary: SBLIM Gatherer
Group: Applications/System
@ -33,6 +33,8 @@ Patch2: sblim-gather-2.2.7-typos.patch
Patch3: sblim-gather-2.2.8-docdir.patch
# Patch4: fixes build fail if "-Werror=format-security" flag is used
Patch4: sblim-gather-2.2.8-format-security.patch
# Patch5: fixes multilib conflicts
Patch5: sblim-gather-2.2.8-multilib.patch
Requires: tog-pegasus >= %{tog_pegasus_version}
Requires(post): systemd
@ -91,6 +93,7 @@ tar xfvz %{SOURCE4}
%patch2 -p1 -b .typos
%patch3 -p1 -b .docdir
%patch4 -p1 -b .format-security
%patch5 -p1 -b .multilib
%build
%ifarch s390 s390x ppc ppc64
@ -243,6 +246,9 @@ fi
%postun provider -p /sbin/ldconfig
%changelog
* Mon Mar 17 2014 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.8-6
- Fix multilib conflicts
* Tue Feb 04 2014 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.8-5
- Fix sblim-gather FTBFS if "-Werror=format-security" flag is used
Resolves: #1037318