From 0a5887a0d1dd62efec577ab7daa161e525ea5af2 Mon Sep 17 00:00:00 2001
From: Jiri Kucera <jkucera@redhat.com>
Date: Wed, 10 Feb 2021 15:54:49 +0100
Subject: [PATCH] Fix file lists

Based on comparison of `opencv-4.5.1/modules/` and
`opencv-4.5.1/opencv_contrib-4.5.1/modules/`, move
some *.so's between core and contrib rpms.
---
 opencv.spec | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/opencv.spec b/opencv.spec
index 43d480c..942ba86 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -45,7 +45,7 @@ Name:           opencv
 Version:        4.5.1
 %global javaver %(foo=%{version}; echo ${foo//./})
 %global abiver  %(foo=%{version}; echo ${foo:0:3})
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Collection of algorithms for computer vision
 # This is normal three clause BSD.
 License:        BSD
@@ -377,30 +377,21 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope
 %files core
 %license LICENSE
 %{_datadir}/licenses/opencv4/
-%{_libdir}/libopencv_alphamat.so.%{abiver}*
+%{_libdir}/libopencv_calib3d.so.%{abiver}*
 %{_libdir}/libopencv_core.so.%{abiver}*
-%{_libdir}/libopencv_cvv.so.%{abiver}*
+%{_libdir}/libopencv_dnn.so.%{abiver}*
 %{_libdir}/libopencv_features2d.so.%{abiver}*
 %{_libdir}/libopencv_flann.so.%{abiver}*
 %{_libdir}/libopencv_gapi.so.%{abiver}*
-%{_libdir}/libopencv_hfs.so.%{abiver}*
 %{_libdir}/libopencv_highgui.so.%{abiver}*
 %{_libdir}/libopencv_imgcodecs.so.%{abiver}*
 %{_libdir}/libopencv_imgproc.so.%{abiver}*
-%{_libdir}/libopencv_intensity_transform.so.%{abiver}*
 %{_libdir}/libopencv_ml.so.%{abiver}*
 %{_libdir}/libopencv_objdetect.so.%{abiver}*
 %{_libdir}/libopencv_photo.so.%{abiver}*
-%{_libdir}/libopencv_rapid.so.%{abiver}*
-%{_libdir}/libopencv_shape.so.%{abiver}*
 %{_libdir}/libopencv_stitching.so.%{abiver}*
-%{_libdir}/libopencv_superres.so.%{abiver}*
 %{_libdir}/libopencv_video.so.%{abiver}*
 %{_libdir}/libopencv_videoio.so.%{abiver}*
-%{_libdir}/libopencv_videostab.so.%{abiver}*
-%if %{with vtk}
-%{_libdir}/libopencv_viz.so.%{abiver}*
-%endif
 
 %files devel
 %dir %{_includedir}/opencv4
@@ -428,13 +419,13 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope
 %endif
 
 %files contrib
+%{_libdir}/libopencv_alphamat.so.%{abiver}*
 %{_libdir}/libopencv_aruco.so.%{abiver}*
 %{_libdir}/libopencv_bgsegm.so.%{abiver}*
 %{_libdir}/libopencv_bioinspired.so.%{abiver}*
-%{_libdir}/libopencv_calib3d.so.%{abiver}*
 %{_libdir}/libopencv_ccalib.so.%{abiver}*
+%{_libdir}/libopencv_cvv.so.%{abiver}*
 %{_libdir}/libopencv_datasets.so.%{abiver}*
-%{_libdir}/libopencv_dnn.so.%{abiver}*
 %{_libdir}/libopencv_dnn_objdetect.so.%{abiver}*
 %{_libdir}/libopencv_dnn_superres.so.%{abiver}*
 %{_libdir}/libopencv_dpm.so.%{abiver}*
@@ -442,26 +433,41 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope
 %{_libdir}/libopencv_freetype.so.%{abiver}*
 %{_libdir}/libopencv_fuzzy.so.%{abiver}*
 %{_libdir}/libopencv_hdf.so.%{abiver}*
+%{_libdir}/libopencv_hfs.so.%{abiver}*
 %{_libdir}/libopencv_img_hash.so.%{abiver}*
+%{_libdir}/libopencv_intensity_transform.so.%{abiver}*
 %{_libdir}/libopencv_line_descriptor.so.%{abiver}*
 %{_libdir}/libopencv_mcc.so.%{abiver}*
 %{_libdir}/libopencv_optflow.so.%{abiver}*
 %{_libdir}/libopencv_phase_unwrapping.so.%{abiver}*
 %{_libdir}/libopencv_plot.so.%{abiver}*
+%{_libdir}/libopencv_quality.so.%{abiver}*
+%{_libdir}/libopencv_rapid.so.%{abiver}*
 %{_libdir}/libopencv_reg.so.%{abiver}*
 %{_libdir}/libopencv_rgbd.so.%{abiver}*
-%{_libdir}/libopencv_quality.so.%{abiver}*
 %{_libdir}/libopencv_saliency.so.%{abiver}*
+%{_libdir}/libopencv_shape.so.%{abiver}*
 %{_libdir}/libopencv_stereo.so.%{abiver}*
 %{_libdir}/libopencv_structured_light.so.%{abiver}*
+%{_libdir}/libopencv_superres.so.%{abiver}*
 %{_libdir}/libopencv_surface_matching.so.%{abiver}*
 %{_libdir}/libopencv_text.so.%{abiver}*
 %{_libdir}/libopencv_tracking.so.%{abiver}*
+%{_libdir}/libopencv_videostab.so.%{abiver}*
+%if %{with vtk}
+%{_libdir}/libopencv_viz.so.%{abiver}*
+%endif
 %{_libdir}/libopencv_ximgproc.so.%{abiver}*
 %{_libdir}/libopencv_xobjdetect.so.%{abiver}*
 %{_libdir}/libopencv_xphoto.so.%{abiver}*
 
 %changelog
+* Wed Feb 10 2021 Jiri Kucera <jkucera@redhat.com> - 4.5.1-6
+- Fix file lists
+  Based on comparison of `opencv-4.5.1/modules/` and
+  `opencv-4.5.1/opencv_contrib-4.5.1/modules/`, move some *.so's between core
+  and contrib rpms
+
 * Sun Jan 31 2021 Orion Poplawski <orion@nwra.com> - 4.5.1-5
 - Rebuild for VTK 9