Compare commits

...

2 Commits
master ... f19

Author SHA1 Message Date
Caolán McNamara 6371b88498 missing hunk of rhbz#884207 multi-lib vigra-config 2013-08-29 15:38:31 +01:00
Caolán McNamara a873468ced Resolves: rhbz#884207 multi-lib vigra-config 2013-08-29 15:10:49 +01:00
3 changed files with 14 additions and 3 deletions

1
.gitignore vendored
View File

@ -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

View File

@ -1 +1,2 @@
b6155afe1ea967917d2be16d98a85404 vigra-1.9.0-src.tar.gz
20eea436aae0ef58230ae3585f04e88f vigra-config.sh

View File

@ -2,10 +2,11 @@
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
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@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