diff --git a/sblim-gather-2.2.8-multilib.patch b/sblim-gather-2.2.8-multilib.patch new file mode 100644 index 0000000..6cd177e --- /dev/null +++ b/sblim-gather-2.2.8-multilib.patch @@ -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 + =dir + + Directory where metric collection plugins are located. Default is +-@libdir@/gather/mplug. ++/usr/lib/gather/mplug ++(/usr/lib64/gather/mplug). + + + +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. + =dir + + Directory where repository metric plugins are located. Default is +-@libdir@/gather/rplug. ++/usr/lib/gather/rplug ++(/usr/lib64/gather/rplug). + + + diff --git a/sblim-gather.spec b/sblim-gather.spec index ecec73f..028e5b0 100644 --- a/sblim-gather.spec +++ b/sblim-gather.spec @@ -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 - 2.2.8-6 +- Fix multilib conflicts + * Tue Feb 04 2014 Vitezslav Crhonek - 2.2.8-5 - Fix sblim-gather FTBFS if "-Werror=format-security" flag is used Resolves: #1037318