diff --git a/pytorch.spec b/pytorch.spec index e911a04cb61bd291958ef8d7247379385a5ef674..4b00a27671fb1ed0cad30948705ccff977cb3cfa 100644 --- a/pytorch.spec +++ b/pytorch.spec @@ -1,4 +1,4 @@ -%global anolis_version 5 +%global anolis_version 6 %global debug_package %{nil} Name: pytorch @@ -22,7 +22,7 @@ BuildRequires: hiredis-devel snappy-devel openblas-devel libzstd-devel leveldb- BuildRequires: pybind11-devel >= 2.7.0 python3-devel peachpy-python3 python3-pybind11 python3-six python3-numpy >= 1:1.19.4 nnpack-devel fmt-devel BuildRequires: gmp-devel mpfr-devel miniz-devel eigen3-devel >= 3.3.9 onnx-devel neon2sse-devel tensorpipe-devel fp16-devel fxdiv-devel BuildRequires: zeromq-devel numactl-devel glog-devel gflags-devel openblas-openmp protobuf-devel protobuf-compiler pthreadpool-devel -BuildRequires: opencv-devel fftw-devel +BuildRequires: fftw-devel BuildRequires: qt5-qtbase-gui qt5-qtbase qt5-qtbase-common Requires: python3-numpy >= 1:1.19.4 @@ -344,7 +344,7 @@ export LD_LIBRARY_PATH="/usr/local/cuda-%{vcu_maj}.%{vcu_min}/%{_lib}/" -DUSE_ROCKSDB=OFF \ %endif -DUSE_FFMPEG=OFF \ - -DUSE_OPENCV=ON \ + -DUSE_OPENCV=OFF \ -DUSE_METAL=OFF \ -DUSE_TBB=OFF \ -DUSE_LLVM=OFF \ @@ -457,6 +457,9 @@ rm -rf %{buildroot}/%{_includedir}/clog.h %changelog +* Wed Jun 14 2023 forrest_ly - 1.10.1-6 +- Rebuild for Anolis OS 8.8 to avoid opencv & protobuf conflict + * Tue Jun 7 2022 forrest_ly - 1.10.1-5 - Min adjust