Packman Build Service PMBS

Changes of Revision 9

speechnote.spec Changed

@@ -28,9 +28,8 @@
 %endif
 
 %bcond_with amd
-%bcond_with nvidia
+%bcond_with nvidia1
 %bcond_with mkl
-%define _without_nvidia 1
 
 Name:           speechnote
 Version:        4.6.1
@@ -112,8 +111,8 @@
 BuildRequires:  hsa-rocr-devel
 %endif
 
-%if %{with nvidia}
-#BuildRequires:  cuda-toolkit-12-4
+%if %{with nvidia1}
+BuildRequires:  cuda-toolkit-12-4
 %endif
 Recommends:     %{name}-python-modules = %{version}
 
@@ -190,7 +189,7 @@
 %if %{with amd}
 tar fx %SOURCE8 -C external/pythonsrc
 %endif
-%if %{with nvidia}
+%if %{with nvidia1}
 tar fx %SOURCE9 -C external/pythonsrc
 %endif
 
@@ -231,7 +230,7 @@
 %cmake \
   -DCMAKE_BUILD_TYPE=Release \
   -DWITH_DESKTOP=ON \
-%if %{without nvidia}
+%if %{without nvidia1}
   -DBUILD_WHISPERCPP_CUBLAS=OFF \
 %endif
 %if %{without amd}
@@ -310,7 +309,7 @@
 cd ../../..
 %endif
 
-%if %{with nvidia}
+%if %{with nvidia1}
 mkdir auxnvidia
 tar fx %{SOURCE7} -C auxnvidia
 cd auxnvidia/CTranslate2-4.3.1
@@ -437,7 +436,7 @@
 done
 %endif
 
-%if %{with nvidia}
+%if %{with nvidia1}
 YAMLSRC=$(dirname $YAMLSRC)/net.mkiol.SpeechNote.Addon.nvidia.yaml
 cd build/auxnvidia/CTranslate2-4.3.1
 %cmake_install
@@ -483,7 +482,7 @@
 rmdir $FLATPAK_DEST/extensions/amd/bin
 chmod a-x $FLATPAK_DEST/extensions/amd/%{_lib}/python%{python_version}/site-packages/triton/third_party/cuda/include/cuda.h
 %endif
-%if %{with nvidia}
+%if %{with nvidia1}
 rmdir $FLATPAK_DEST/extensions/nvidia/bin
 rmdir $FLATPAK_DEST/extensions/nvidia/lib/python%{python_version}/site-packages
 rmdir $FLATPAK_DEST/extensions/nvidia/lib/python%{python_version}
@@ -531,7 +530,7 @@
 %if %{with amd}
 %exclude %{_datadir}/%{aname}/lib/libwhisper-hipblas.so*
 %endif
-%if %{with nvidia}
+%if %{with nvidia1}
 %exclude %{_datadir}/%{aname}/lib/libwhisper-cublas.so*
 %endif
 %exclude %{_datadir}/%{aname}/python
@@ -541,7 +540,7 @@
 %if %{with amd}
 %exclude %{_datadir}/%{aname}/python/extensions/amd
 %endif
-%if %{with nvidia}
+%if %{with nvidia1}
 %exclude %{_datadir}/%{aname}/python/extensions/nvidia
 %endif
 
@@ -551,7 +550,7 @@
 %{_datadir}/%{aname}/lib/libwhisper-hipblas.so*
 %endif
 
-%if %{with nvidia}
+%if %{with nvidia1}
 %files nvidia
 %{_datadir}/%{aname}/python/extensions/nvidia
 %{_datadir}/%{aname}/lib/libwhisper-cublas.so*