From a873468ced30e3961c325e80be6090c513d9a780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Thu, 29 Aug 2013 15:10:49 +0100
Subject: [PATCH] Resolves: rhbz#884207 multi-lib vigra-config

---
 .gitignore |  1 +
 sources    |  1 +
 vigra.spec | 12 ++++++++++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index ff247d2..4677fb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ vigra-1.7.0-src.tar.gz
 /vigra-1.7.1-src.tar.gz
 /vigra-1.8.0-src.tar.gz
 /vigra-1.9.0-src.tar.gz
+/vigra-config.sh
diff --git a/sources b/sources
index 3a23809..543fc35 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 b6155afe1ea967917d2be16d98a85404  vigra-1.9.0-src.tar.gz
+20eea436aae0ef58230ae3585f04e88f  vigra-config.sh
diff --git a/vigra.spec b/vigra.spec
index faf57ef..6bfdebd 100644
--- a/vigra.spec
+++ b/vigra.spec
@@ -2,7 +2,7 @@
 Summary:        Generic Programming for Computer Vision
 Name:           vigra
 Version:        1.9.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 License:        MIT
 Group:          Development/Libraries
 Source:         http://hci.iwr.uni-heidelberg.de/%{name}/%{name}-%{version}-src.tar.gz
@@ -65,6 +65,11 @@ find ./doc/ -type f | xargs chmod -x
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 rm -rf %{buildroot}/usr/doc
+(
+ cd $RPM_BUILD_ROOT%{_bindir}
+ mv vigra-config vigra-config-%{__isa_bits}
+)
+install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config
 
 #fixme: this fails,
 #%check
@@ -84,7 +89,7 @@ rm -rf %{buildroot}
 %files devel
 %defattr(-, root, root,-)
 %{_includedir}/vigra
-%{_bindir}/vigra-config
+%{_bindir}/vigra-config*
 %{_libdir}/libvigraimpex.so
 %{_libdir}/vigra
 %doc doc/vigra doc/vigranumpy
@@ -96,6 +101,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Thu Aug 29 2013 Caolán McNamara <caolanm@redhat.com> - 1.9.0-9
+- Resolves: rhbz#884207 multi-lib vigra-config
+
 * Wed Jul 24 2013 Caolán McNamara <caolanm@redhat.com> - 1.9.0-8
 - Resolves: rhbz#987048 explicit python path in shebang