[vigra] Resolves: rhbz#884207 multi-lib vigra-config

[Caolán McNamara]

commit d4d4f7f7a56fe3c6312d782f640870eeac3fc560
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 29 14:47:20 2013 +0100

    Resolves: rhbz#884207 multi-lib vigra-config

 .gitignore |    1 +
 sources    |    1 +
 vigra.spec |   15 ++++++++++++---
 3 files changed, 14 insertions(+), 3 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 522508d..2e1356e 100644
--- a/vigra.spec
+++ b/vigra.spec
@@ -2,10 +2,11 @@
 Summary:        Generic Programming for Computer Vision
 Name:           vigra
 Version:        1.9.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:        MIT
 Group:          Development/Libraries
-Source:         http://hci.iwr.uni-heidelberg.de/%{name}/%{name}-%{version}-src.tar.gz
+Source0:        http://hci.iwr.uni-heidelberg.de/%{name}/%{name}-%{version}-src.tar.gz
+Source1:        vigra-config.sh
 URL:            http://hci.iwr.uni-heidelberg.de/vigra/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  zlib-devel libjpeg-devel libpng-devel libtiff-devel fftw-devel >= 3
@@ -65,6 +66,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 +90,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 +102,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Thu Aug 29 2013 Caolán McNamara <caolanm at redhat.com> - 1.9.0-11
+- Resolves: rhbz#884207 multi-lib vigra-config
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild