.gitignore

@@ -1,4 +1,5 @@
-OpenCV*.tar.*
-opencv*.tar.*
-face_landmark_model.dat.xz
-/b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip
+SOURCES/b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip
+SOURCES/face_landmark_model.dat.xz
+SOURCES/opencv_extra-clean-4.6.0.tar.gz
+SOURCES/opencv-clean-4.6.0.tar.gz
+SOURCES/opencv_contrib-clean-4.6.0.tar.gz

.opencv.metadata

@@ -0,0 +1,5 @@
+80d8ee4757cf3dca0e485ce920d181750b410f31  SOURCES/b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip
+b3fe7e6db1f8c77a13fbc4b32ac0e90a443f1d57  SOURCES/face_landmark_model.dat.xz
+e74b465c1e0e1d40d78cd968d41135e6ff79b7e0  SOURCES/opencv_extra-clean-4.6.0.tar.gz
+93dfb2504d4a82d17d8c7037332d265ca330143d  SOURCES/opencv-clean-4.6.0.tar.gz
+5ce991a17e61c94ec40d5beff27ecaac6ca5df02  SOURCES/opencv_contrib-clean-4.6.0.tar.gz

SPECS/opencv.spec

@@ -514,6 +514,9 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope
 %{_libdir}/libopencv_xphoto.so.{%{abiver},%{version}}
 
 %changelog
+* Wed Sep 20 2023 Arkady L. Shane <tigro@msvsphere.ru> - 4.6.0-7
+- Rebuilt for MSVSphere 9.2
+
 * Wed Sep 28 2022 Tom Rix <trix@redhat.com> - 4.6.0-7
 - Remove Unicap
 

opencv-4.1.2-includes.patch

@@ -1,24 +0,0 @@
-diff -up opencv-4.1.2/cmake/templates/OpenCVConfig.cmake.in.orig opencv-4.1.2/cmake/templates/OpenCVConfig.cmake.in
---- opencv-4.1.2/cmake/templates/OpenCVConfig.cmake.in.orig	2019-10-10 00:53:14.000000000 +0200
-+++ opencv-4.1.2/cmake/templates/OpenCVConfig.cmake.in	2019-10-17 11:08:46.626400320 +0200
-@@ -106,7 +106,7 @@ set(OpenCV_SHARED @BUILD_SHARED_LIBS@)
- set(OpenCV_USE_MANGLED_PATHS @OpenCV_USE_MANGLED_PATHS_CONFIGCMAKE@)
- 
- set(OpenCV_LIB_COMPONENTS @OPENCV_MODULES_CONFIGCMAKE@)
--set(__OpenCV_INCLUDE_DIRS @OpenCV_INCLUDE_DIRS_CONFIGCMAKE@)
-+set(__OpenCV_INCLUDE_DIRS @OpenCV_INCLUDE_DIRS_CONFIGCMAKE@ @OpenCV_INCLUDE_DIRS_CONFIGCMAKE@/opencv2)
- 
- set(OpenCV_INCLUDE_DIRS "")
- foreach(d ${__OpenCV_INCLUDE_DIRS})
-diff -up opencv-4.1.2/cmake/templates/opencv-XXX.pc.in.orig opencv-4.1.2/cmake/templates/opencv-XXX.pc.in
---- opencv-4.1.2/cmake/templates/opencv-XXX.pc.in.orig	2019-10-10 00:53:14.000000000 +0200
-+++ opencv-4.1.2/cmake/templates/opencv-XXX.pc.in	2019-10-17 11:04:11.486014573 +0200
-@@ -3,7 +3,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir_old=@includedir@/opencv
-+includedir_old=@includedir@/opencv2
- includedir_new=@includedir@
- 
- Name: OpenCV

opencv-clean.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-
-VERSION=4.6.0
-
-wget -c https://github.com/opencv/opencv/archive/${VERSION}/opencv-${VERSION}.tar.gz
-wget -c https://github.com/opencv/opencv_contrib/archive/${VERSION}/opencv_contrib-${VERSION}.tar.gz
-wget -c https://github.com/opencv/opencv_extra/archive/${VERSION}/opencv_extra-${VERSION}.tar.gz
-
-rm -rf opencv-${VERSION}/
-tar xf opencv-${VERSION}.tar.gz
-find opencv-${VERSION}/ -iname "*lena*" -exec rm {} ';' -print
-find opencv-${VERSION}/ -iname "*lenna*" -exec rm {} ';' -print
-rm -r opencv-${VERSION}/modules/xfeatures2d/
-tar zcf opencv-clean-${VERSION}.tar.gz opencv-${VERSION}/
-rm -r opencv-${VERSION}/
-
-rm -rf opencv_contrib-${VERSION}/
-tar xf opencv_contrib-${VERSION}.tar.gz
-find opencv_contrib-${VERSION}/ -iname "*lena*" -exec rm {} ';' -print
-find opencv_contrib-${VERSION}/ -iname "*lenna*" -exec rm {} ';' -print
-rm -r opencv_contrib-${VERSION}/modules/xfeatures2d/
-tar zcf opencv_contrib-clean-${VERSION}.tar.gz opencv_contrib-${VERSION}/
-rm -r opencv_contrib-${VERSION}/
-
-rm -rf opencv_extra-${VERSION}/
-tar xf opencv_extra-${VERSION}.tar.gz
-find opencv_extra-${VERSION} -iname "*lena*" -exec rm {} ';' -print
-find opencv_extra-${VERSION} -iname "*lenna*" -exec rm {} ';' -print
-find opencv_extra-${VERSION} \( -iname "len*.*" -o -iname "*lena*.png" -o -iname "*lena*.jpg" \) -exec rm {} ';' -print
-tar zcf opencv_extra-clean-${VERSION}.tar.gz opencv_extra-${VERSION}/
-rm -r opencv_extra-${VERSION}/
-
-
-echo fedpkg new-sources $(spectool -l --sources opencv.spec)

sources

@@ -1,5 +0,0 @@
-SHA512 (opencv-clean-4.6.0.tar.gz) = 73815df0df4b93b3df19d66e0957a781de25c78ee51d0f026129df9302d45b114bf3cd249ed13121c160df7b4c01b9e348fe2ba75949d3e25fe6f6168d2b0576
-SHA512 (opencv_contrib-clean-4.6.0.tar.gz) = 8f4a6569671eb161beac6c9bc52f51b3a9e1ac257478477d5238ddcac959612055ab8554a5815f5b55fe8405a34885e63c1c9995468e5641b9d47d1120ef0113
-SHA512 (opencv_extra-clean-4.6.0.tar.gz) = 2b576a2ed87e1a41fddb351bbc66fa23397aa6952866aec3d172976d261f035dc0c1f3e7c66e85e0684bb050862c368fe7fdc34804a9c6171cf1b2a96b621a33
-SHA512 (face_landmark_model.dat.xz) = 7558f29431bb9cad1f22ee067ad3ed41be8f68b865992eb7d3a5ce6b6b9e1d031cb03e33c3c149220ef8faebd0471703a8a3bbb06402bcc8ce76bd28317aa307
-SHA512 (b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip) = f2994d5e92a2ae05cee6e153943afe151ce734ced6e06dcdb02dee9fed9336a7f1ea69661d9e033f1412fbb5e2a44a6e641662c85be5ba0604d0446abeabe836