From ac7a4a346fa305a00e32415541def11324f67eea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 14 Jan 2023 22:58:32 +0000 Subject: [PATCH] autosetup not handle multiple "-a" parameters --- opencv.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/opencv.spec b/opencv.spec index e1bc1f5..f96bb46 100644 --- a/opencv.spec +++ b/opencv.spec @@ -272,7 +272,9 @@ distribution, since the library maintains binary compatibility, and tries to provide decent performance and stability. %prep -%autosetup -p1 -a1 %{?with_extras:-a2} +# autosetup doesn't work with 2 sources +# https://github.com/rpm-software-management/rpm/issues/1204 +%setup -q -a1 %{?with_extras:-a2} %if 1 # we don't use pre-built contribs except quirc pushd 3rdparty @@ -283,6 +285,9 @@ shopt -u extglob popd &>/dev/null %endif +%patch0 -p1 -b .install_3rdparty_licenses +%patch3 -p1 -b .python_install_binary + pushd %{name}_contrib-%{version} #patch1 -p1 -b .install_cvv popd