BR vte-java only on %java_arches
This commit is contained in:
parent
d120efa9ea
commit
a81f14f90a
12
opencv.spec
12
opencv.spec
@ -59,7 +59,7 @@ Version: 4.6.0
|
|||||||
%global minorver %(foo=%{version}; a=(${foo//./ }); echo ${a[1]} )
|
%global minorver %(foo=%{version}; a=(${foo//./ }); echo ${a[1]} )
|
||||||
%global padding %(digits=00; num=%{minorver}; echo ${digits:${#num}:${#digits}} )
|
%global padding %(digits=00; num=%{minorver}; echo ${digits:${#num}:${#digits}} )
|
||||||
%global abiver %(echo %{majorver}%{padding}%{minorver} )
|
%global abiver %(echo %{majorver}%{padding}%{minorver} )
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
Summary: Collection of algorithms for computer vision
|
Summary: Collection of algorithms for computer vision
|
||||||
# This is normal three clause BSD.
|
# This is normal three clause BSD.
|
||||||
License: BSD
|
License: BSD
|
||||||
@ -151,7 +151,12 @@ BuildRequires: hdf5-devel
|
|||||||
BuildRequires: openjpeg2-devel
|
BuildRequires: openjpeg2-devel
|
||||||
# Module opencv_ovis disabled because of incompatible OGRE3D version < 1.10
|
# Module opencv_ovis disabled because of incompatible OGRE3D version < 1.10
|
||||||
# BuildRequires: ogre-devel
|
# BuildRequires: ogre-devel
|
||||||
%{?with_vtk:BuildRequires: vtk-devel vtk-java}
|
%{?with_vtk:BuildRequires: vtk-devel}
|
||||||
|
%{?with_vtk:
|
||||||
|
%{?with_java:
|
||||||
|
BuildRequires: vtk-java
|
||||||
|
}
|
||||||
|
}
|
||||||
%{?with_atlas:BuildRequires: atlas-devel}
|
%{?with_atlas:BuildRequires: atlas-devel}
|
||||||
#ceres-solver-devel push eigen3-devel and tbb-devel
|
#ceres-solver-devel push eigen3-devel and tbb-devel
|
||||||
%{?with_tbb:
|
%{?with_tbb:
|
||||||
@ -492,6 +497,9 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope
|
|||||||
%{_libdir}/libopencv_xphoto.so.{%{abiver},%{version}}
|
%{_libdir}/libopencv_xphoto.so.{%{abiver},%{version}}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jul 29 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.6.0-6
|
||||||
|
- BR vte-java only on %%java_arches
|
||||||
|
|
||||||
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.0-5
|
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.0-5
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user