Require boost-python2-devel to fix build with boost-1.66.0-7.fc29
This commit is contained in:
parent
24e85c0a6e
commit
58c768e72d
11
vigra.spec
11
vigra.spec
@ -1,12 +1,16 @@
|
|||||||
|
%if 0%{?fedora} > 28
|
||||||
|
%global boostpy2 boost-python2 boost-python2-devel
|
||||||
|
%else
|
||||||
%if 0%{?fedora} > 27
|
%if 0%{?fedora} > 27
|
||||||
%global boostpy2 boost-python2
|
%global boostpy2 boost-python2
|
||||||
%else
|
%else
|
||||||
%global boostpy2 boost-python
|
%global boostpy2 boost-python
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
Summary: Generic Programming for Computer Vision
|
Summary: Generic Programming for Computer Vision
|
||||||
Name: vigra
|
Name: vigra
|
||||||
Version: 1.11.1
|
Version: 1.11.1
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
# The "Lenna" files are non-free, we need to remove them from the source tarball.
|
# The "Lenna" files are non-free, we need to remove them from the source tarball.
|
||||||
@ -28,7 +32,7 @@ BuildRequires: cmake boost-devel doxygen
|
|||||||
%if ! 0%{?rhel}
|
%if ! 0%{?rhel}
|
||||||
Requires: python3
|
Requires: python3
|
||||||
BuildRequires: hdf5-devel python2-sphinx python2-numpy-f2py %{boostpy2} OpenEXR-devel
|
BuildRequires: hdf5-devel python2-sphinx python2-numpy-f2py %{boostpy2} OpenEXR-devel
|
||||||
BuildRequires: python3-numpy-f2py boost-python3
|
BuildRequires: python3-numpy-f2py boost-python3 boost-python3-devel
|
||||||
%else
|
%else
|
||||||
Requires: python
|
Requires: python
|
||||||
%endif
|
%endif
|
||||||
@ -170,6 +174,9 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 01 2018 Jonathan Wakely <jwakely@redhat.com> - 1.11.1-7
|
||||||
|
- Require boost-python2-devel to fix build with boost-1.66.0-7.fc29
|
||||||
|
|
||||||
* Wed Mar 07 2018 Adam Williamson <awilliam@redhat.com> - 1.11.1-6
|
* Wed Mar 07 2018 Adam Williamson <awilliam@redhat.com> - 1.11.1-6
|
||||||
- Rebuild to fix GCC 8 mis-compilation
|
- Rebuild to fix GCC 8 mis-compilation
|
||||||
See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64")
|
See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64")
|
||||||
|
Loading…
Reference in New Issue
Block a user