Drop compat symlink for includes
This commit is contained in:
parent
d4fbc923e1
commit
f5498f0349
13
opencv.spec
13
opencv.spec
|
@ -60,7 +60,7 @@
|
|||
|
||||
Name: opencv
|
||||
Version: 4.2.0
|
||||
Release: 5%{?dist}
|
||||
Release: 6%{?dist}
|
||||
Summary: Collection of algorithms for computer vision
|
||||
# This is normal three clause BSD.
|
||||
License: BSD
|
||||
|
@ -349,10 +349,6 @@ ln -s -r %{buildroot}%{_jnidir}/libopencv_java%{javaver}.so %{buildroot}%{_jnidi
|
|||
ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/opencv.jar
|
||||
%endif
|
||||
|
||||
# For compatiblity with downstream expectation
|
||||
ln -s opencv4/opencv2 %{buildroot}%{_includedir}
|
||||
ln -s opencv4 %{buildroot}%{_datadir}/opencv
|
||||
|
||||
# For compatibility with existing opencv.pc application
|
||||
%{!?without_compat_openvc_pc:
|
||||
ln -s opencv4.pc %{buildroot}%{_libdir}/pkgconfig/opencv.pc
|
||||
|
@ -382,8 +378,6 @@ popd
|
|||
%files
|
||||
%doc README.md
|
||||
%{_bindir}/opencv_*
|
||||
# Symlink for compatibilty with older version
|
||||
%{_datadir}/opencv
|
||||
%dir %{_datadir}/opencv4
|
||||
%{_datadir}/opencv4/haarcascades
|
||||
%{_datadir}/opencv4/lbpcascades
|
||||
|
@ -416,8 +410,6 @@ popd
|
|||
%endif
|
||||
|
||||
%files devel
|
||||
# Symlink for compatibilty with older version
|
||||
%{_includedir}/opencv2
|
||||
%dir %{_includedir}/opencv4
|
||||
%{_includedir}/opencv4/opencv2
|
||||
%{_libdir}/lib*.so
|
||||
|
@ -476,6 +468,9 @@ popd
|
|||
%{_libdir}/libopencv_xphoto.so.%{abiver}*
|
||||
|
||||
%changelog
|
||||
* Fri May 08 2020 Nicolas Chauvet <kwizart@gmail.com> - 4.2.0-6
|
||||
- Drop compat symlink for includes - rhbz#1830266
|
||||
|
||||
* Thu Mar 26 2020 Nicolas Chauvet <kwizart@gmail.com> - 4.2.0-5
|
||||
- Add without_compat_opencv_pc with conditional - rhbz#1816439
|
||||
|
||||
|
|
Loading…
Reference in New Issue