[rpms/opencv] opencv5: Install python egg-info

A new commit has been pushed.

Repo   : rpms/opencv
Branch : opencv5
Commit : 4a71091ffe1692d1d25b398aa7fe7b7b62c1ce11
Author : Sérgio M. Basto <sergio@serjux.com>
Date   : 2023-05-13T06:30:55+01:00
Stats  : +10/-108 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/opencv/c/4a71091ffe1692d1d25b398aa7fe7b7b62c1ce11?branch=opencv5

Log:
Install python egg-info

---
diff --git a/opencv.spec b/opencv.spec
index cdada14..60dede4 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -74,7 +74,7 @@ Version:        4.7.0
 %global minorver %(foo=%{version}; a=(${foo//./ }); echo ${a[1]} )
 %global padding  %(digits=00; num=%{minorver}; echo ${digits:${#num}:${#digits}} )
 %global abiver   %(echo %{majorver}%{padding}%{minorver} )
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Collection of algorithms for computer vision
 # This is normal three clause BSD.
 License:        BSD
@@ -94,7 +94,6 @@ Source3:        face_landmark_model.dat.xz
 # from https://github.com/opencv/ade/archive/v0.1.2a.zip
 # mv v0.1.2a.zip $(md5sum v0.1.2a.zip | cut -d' ' -f1)-v0.1.2a.zip
 Source4:        fa4b3e25167319cb0fa9432ef8281945-v0.1.2a.zip
-Source5:        xorg.conf
 
 Patch0:         opencv-4.1.0-install_3rdparty_licenses.patch
 Patch3:         opencv.python.patch
@@ -137,6 +136,7 @@ BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig
 BuildRequires:  python3-devel
 BuildRequires:  python3-numpy
+BuildRequires:  python3-setuptools
 %{?with_linters:
 BuildRequires:  pylint
 BuildRequires:  python3-flake8
@@ -382,6 +382,8 @@ install -pm 0644 %{SOURCE4} .cache/ade/
 
 %install
 %cmake_install
+cd %{__cmake_builddir}/python_loader/
+%py3_install
 
 rm -rf %{buildroot}%{_datadir}/OpenCV/licenses/
 %if %{with java}
@@ -398,15 +400,9 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope
 %check
 #ifnarch ppc64
 %if %{with tests}
-    cp %SOURCE5 %{__cmake_builddir}
-    if [ -x /usr/libexec/Xorg ]; then
-       Xorg=/usr/libexec/Xorg
-    else
-       Xorg=/usr/libexec/Xorg.bin
-    fi
-    $Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log -config ./xorg.conf -configdir . :99 &
-    export DISPLAY=:99
     export LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/%{__cmake_builddir}/lib:$LD_LIBARY_PATH
+    xvfb-run --server-args=5120x3200x24 &
+    export DISPLAY=:99
     %ctest || :
 %endif
 #endif
@@ -461,6 +457,7 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope
 
 %files -n python3-opencv
 %{python3_sitearch}/cv2
+%{python3_sitelib}/opencv-*.egg-info
 
 %if %{with java}
 %files java
@@ -520,6 +517,9 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope
 %{_libdir}/libopencv_xphoto.so.{%{abiver},%{version}}
 
 %changelog
+* Sat May 13 2023 Sérgio Basto <sergio@serjux.com> - 4.7.0-7
+- Install python egg-info
+
 * Thu May 11 2023 Sandro Mani <manisandro@gmail.com> - 4.7.0-6
 - Rebuild (gdal)
 - Disable tests, even only tests, fail to build and generate build.log with millions of logs lines saying:

diff --git a/xorg.conf b/xorg.conf
deleted file mode 100644
index 8edc240..0000000
--- a/xorg.conf
+++ /dev/null
@@ -1,98 +0,0 @@
-# This xorg configuration file is meant to be used
-# to start a dummy X11 server for graphical testing.
-
-Section "ServerFlags"
-  Option "DontVTSwitch" "true"
-  Option "AllowMouseOpenFail" "true"
-  Option "PciForceNone" "true"
-  Option "AutoEnableDevices" "false"
-  Option "AutoAddDevices" "false"
-EndSection
-
-Section "InputDevice"
-  Identifier "dummy_mouse"
-  Option "CorePointer" "true"
-  Driver "void"
-EndSection
-
-Section "InputDevice"
-  Identifier "dummy_keyboard"
-  Option "CoreKeyboard" "true"
-  Driver "void"
-EndSection
-
-Section "Device"
-  Identifier "dummy_videocard"
-  Driver "dummy"
-  Option "ConstantDPI" "true"
-  #VideoRam 4096000
-  #VideoRam 256000
-  VideoRam 192000
-EndSection
-
-Section "Monitor"
-  Identifier "dummy_monitor"
-  HorizSync   5.0 - 1000.0
-  VertRefresh 5.0 - 200.0
-  #This can be used to get a specific DPI, but only for the default resolution:
-  #DisplaySize 508 317
-  #NOTE: the highest modes will not work without increasing the VideoRam
-  # for the dummy video card.
-  Modeline "32768x32768" 15226.50 32768 35800 39488 46208 32768 32771 32781 32953
-  Modeline "32768x16384" 7516.25 32768 35544 39192 45616 16384 16387 16397 16478
-  Modeline "16384x8192" 2101.93 16384 16416 24400 24432 8192 8390 8403 8602
-  Modeline "8192x4096" 424.46 8192 8224 9832 9864 4096 4195 4202 4301
-  Modeline "5496x1200" 199.13 5496 5528 6280 6312 1200 1228 1233 1261
-  Modeline "5280x1080" 169.96 5280 5312 5952 5984 1080 1105 1110 1135
-  Modeline "5280x1200" 191.40 5280 5312 6032 6064 1200 1228 1233 1261
-  Modeline "5120x3200" 199.75 5120 5152 5904 5936 3200 3277 3283 3361
-  Modeline "4800x1200" 64.42 4800 4832 5072 5104 1200 1229 1231 1261
-  Modeline "3840x2880" 133.43 3840 3872 4376 4408 2880 2950 2955 3025
-  Modeline "3840x2560" 116.93 3840 3872 4312 4344 2560 2622 2627 2689
-  Modeline "3840x2048" 91.45 3840 3872 4216 4248 2048 2097 2101 2151
-  Modeline "3840x1080" 100.38 3840 3848 4216 4592 1080 1081 1084 1093
-  Modeline "3600x1200" 106.06 3600 3632 3984 4368 1200 1201 1204 1214
-  Modeline "3288x1080" 39.76 3288 3320 3464 3496 1080 1106 1108 1135
-  Modeline "2048x2048" 49.47 2048 2080 2264 2296 2048 2097 2101 2151
-  Modeline "2048x1536" 80.06 2048 2104 2312 2576 1536 1537 1540 1554
-  Modeline "2560x1600" 47.12 2560 2592 2768 2800 1600 1639 1642 1681
-  Modeline "2560x1440" 42.12 2560 2592 2752 2784 1440 1475 1478 1513
-  Modeline "1920x1440" 69.47 1920 1960 2152 2384 1440 1441 1444 1457
-  Modeline "1920x1200" 26.28 1920 1952 2048 2080 1200 1229 1231 1261
-  Modeline "1920x1080" 23.53 1920 1952 2040 2072 1080 1106 1108 1135
-  Modeline "1680x1050" 20.08 1680 1712 1784 1816 1050 1075 1077 1103
-  Modeline "1600x1200" 22.04 1600 1632 1712 1744 1200 1229 1231 1261
-  Modeline "1600x900" 33.92 1600 1632 1760 1792 900 921 924 946
-  Modeline "1440x900" 30.66 1440 1472 1584 1616 900 921 924 946
-  ModeLine "1366x768" 72.00 1366 1414 1446 1494  768 771 777 803
-  Modeline "1280x1024" 31.50 1280 1312 1424 1456 1024 1048 1052 1076
-  Modeline "1280x800" 24.15 1280 1312 1400 1432 800 819 822 841
-  Modeline "1280x768" 23.11 1280 1312 1392 1424 768 786 789 807
-  Modeline "1360x768" 24.49 1360 1392 1480 1512 768 786 789 807
-  Modeline "1024x768" 18.71 1024 1056 1120 1152 768 786 789 807
-  Modeline "768x1024" 19.50 768 800 872 904 1024 1048 1052 1076
-EndSection
-
-Section "Screen"
-  Identifier "dummy_screen"
-  Device "dummy_videocard"
-  Monitor "dummy_monitor"
-  DefaultDepth 24
-  SubSection "Display"
-    Viewport 0 0
-    Depth 24
-    #Modes "32768x32768" "32768x16384" "16384x8192" "8192x4096" "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768"
-    Modes "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768"
-    #Virtual 32000 32000
-    #Virtual 16384 8192
-    Virtual 8192 4096
-    #Virtual 5120 3200
-  EndSubSection
-EndSection
-
-Section "ServerLayout"
-  Identifier   "dummy_layout"
-  Screen       "dummy_screen"
-  InputDevice  "dummy_mouse"
-  InputDevice  "dummy_keyboard"
-EndSection