diff --git a/download b/download new file mode 100644 index 0000000000000000000000000000000000000000..d09607f15f013b0c8d8b573889150e125f2308ee --- /dev/null +++ b/download @@ -0,0 +1,3 @@ +7505c44ca4eb54b4ab1e4777cb96ac05 face_landmark_model.dat +0f084dfef743cb4906e421992b42b578 opencv-clean-4.7.0.tar.gz +14454b0ca83fe0506b0a0c35a9dc7891 opencv_contrib-clean-4.7.0.tar.gz diff --git a/face_landmark_model.dat.xz b/face_landmark_model.dat.xz deleted file mode 100644 index b66a21034c37dfaa721e5bfb9e7680245af798f9..0000000000000000000000000000000000000000 Binary files a/face_landmark_model.dat.xz and /dev/null differ diff --git a/opencv-clean-4.7.0.tar.gz b/opencv-clean-4.7.0.tar.gz deleted file mode 100644 index 44382b0c99920fd68945025124d98b7558c73bd9..0000000000000000000000000000000000000000 Binary files a/opencv-clean-4.7.0.tar.gz and /dev/null differ diff --git a/opencv.spec b/opencv.spec index e0d8b4b66dafccf744fba99d541df9f3ba54a607..28906ac396de780c9f7926b32d177a86a209f804 100644 --- a/opencv.spec +++ b/opencv.spec @@ -1,4 +1,4 @@ -%define anolis_release 9 +%define anolis_release 10 %undefine __cmake_in_source_build %bcond_with tests @@ -64,11 +64,8 @@ Source1: %{name}_contrib-clean-%{version}.tar.gz %{?with_extras_tests: Source2: %{name}_extra-clean-%{version}.tar.gz } -# files from https://github.com/opencv/opencv_3rdparty/blob/contrib_face_alignment_20170818/face_landmark_model.dat -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 +Source3: https://github.com/opencv/opencv_3rdparty/raw/contrib_face_alignment_20170818/face_landmark_model.dat +Source4: https://github.com/opencv/ade/archive/v0.1.2a.zip#/fa4b3e25167319cb0fa9432ef8281945-v0.1.2a.zip Source5: xorg.conf Source6: opencv-clean.sh @@ -252,7 +249,6 @@ popd mkdir -p .cache/data install -pm 0644 %{SOURCE3} .cache/data pushd .cache/data - xz -d face_landmark_model.dat.xz mv face_landmark_model.dat 7505c44ca4eb54b4ab1e4777cb96ac05-face_landmark_model.dat popd @@ -447,6 +443,9 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope %{_libdir}/libopencv_xphoto.so.{%{abiver},%{version}} %changelog +* Thu Dec 28 2023 Chunmei Xu - 4.7.0-10 +- correct source files + * Thu Dec 28 2023 Chunmei Xu - 4.7.0-9 - rebuild with protobuf-3.20.2 diff --git a/opencv_contrib-clean-4.7.0.tar.gz b/opencv_contrib-clean-4.7.0.tar.gz deleted file mode 100644 index 94c3e7d3249437d09ef0ca44485bbb914b32c1dc..0000000000000000000000000000000000000000 Binary files a/opencv_contrib-clean-4.7.0.tar.gz and /dev/null differ