From b531bcac65d8cea577e63266862ce01347f262d4 Mon Sep 17 00:00:00 2001
From: Jaroslav Škarvada <jskarvad@redhat.com>
Date: Mar 05 2014 20:35:28 +0000
Subject: Fixed multilib


---

diff --git a/bltk.spec b/bltk.spec
index 517c273..22bfb05 100644
--- a/bltk.spec
+++ b/bltk.spec
@@ -1,6 +1,6 @@
 Name:		bltk
 Version:	1.1.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	The BLTK measures notebook battery life under any workload
 
 Group:		Applications/System
@@ -101,12 +101,6 @@ install -m 755 bin/bat_drain	${RPM_BUILD_ROOT}%{_libdir}/bltk/bin/bat_drain
 install -m 755 bin/bat_drain_table	${RPM_BUILD_ROOT}%{_libdir}/bltk/bin/bat_drain_table
 
 install -m 755 bin/bltk	${RPM_BUILD_ROOT}%{_libdir}/bltk/bin
-ln -s %{_libdir}/bltk/bin/bltk ${RPM_BUILD_ROOT}%{_bindir}/bltk
-ln -s %{_libdir}/bltk/bin/bltk_plot ${RPM_BUILD_ROOT}%{_bindir}/bltk_plot
-ln -s %{_libdir}/bltk/bin/bltk_report ${RPM_BUILD_ROOT}%{_bindir}/bltk_report
-ln -s %{_libdir}/bltk/bin/bltk_report_compress ${RPM_BUILD_ROOT}%{_bindir}/bltk_report_compress
-ln -s %{_libdir}/bltk/bin/bltk_report_table ${RPM_BUILD_ROOT}%{_bindir}/bltk_report_table
-ln -s %{_libdir}/bltk/bin/bltk_report_uncompress ${RPM_BUILD_ROOT}%{_bindir}/bltk_report_uncompress
 
 install -m 755 lib/libxse.so.0	${RPM_BUILD_ROOT}%{_libdir}/bltk/lib/libxse.so.0
 
@@ -138,6 +132,22 @@ install -m 755 wl_reader/bin/bltk_wl_reader ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_
 install -m 755 wl_reader/bin/bltk_wl_reader_xse ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_reader/bin
 install -m 644 wl_reader/war_and_peace.html ${RPM_BUILD_ROOT}%{_libdir}/bltk/wl_reader
 
+cat << ":EOF" > ${RPM_BUILD_ROOT}%{_bindir}/bltk
+#!/bin/sh
+
+bltk_native="$(rpm --eval '%%{_libdir}')/bltk/bin/$(basename $0)"
+
+[ -x "$bltk_native" ] && exec "$bltk_native" "$@"
+exec /usr/lib/bltk/bin/$(basename $0) "$@"
+:EOF
+chmod a+rx ${RPM_BUILD_ROOT}%{_bindir}/bltk
+pushd ${RPM_BUILD_ROOT}%{_bindir}
+for f in bltk_plot bltk_report bltk_report_compress bltk_report_table bltk_report_uncompress;
+do
+  ln -s bltk $f
+done
+popd
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -231,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/bltk/wl_reader/war_and_peace.html
 
 %changelog
+* Wed Mar  5 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 1.1.0-7
+- Fixed multilib
+
 * Mon Mar  3 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 1.1.0-6
 - Fixed application of CFLAGS