Author: baggins Date: Wed Oct 6 10:40:04 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 3.1 - do not install profiler by default as it requires either Qt < 4.7 or packaging additional set of internal qt libs
---- Files affected: packages/cudatoolkit: cudatoolkit.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: packages/cudatoolkit/cudatoolkit.spec diff -u packages/cudatoolkit/cudatoolkit.spec:1.4 packages/cudatoolkit/cudatoolkit.spec:1.5 --- packages/cudatoolkit/cudatoolkit.spec:1.4 Tue Feb 16 16:06:44 2010 +++ packages/cudatoolkit/cudatoolkit.spec Wed Oct 6 12:39:59 2010 @@ -1,15 +1,19 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_with prof # package computeprof (requires Qt < 4.7) +# Summary: NVIDIA CUDA Toolkit Summary(pl.UTF-8): Zestaw narzędzi NVIDIA CUDA Name: cudatoolkit -Version: 2.3 -Release: 2 +Version: 3.1 +Release: 1 License: nVidia Binary Group: Applications -Source0: http://developer.download.nvidia.com/compute/cuda/2_3/toolkit/%{name}_%{version}_linux_32_fedora10.run -# Source0-md5: 4c7d5002aeff376f826e9744d8322dbe -Source1: http://developer.download.nvidia.com/compute/cuda/2_3/toolkit/%{name}_%{version}_linux_64_fedora10.run -# Source1-md5: 9da21f449005be25d0fc928c914562ba +Source0: http://developer.download.nvidia.com/compute/cuda/3_1/toolkit/%{name}_%{version}_linux_32_fedora12.run +# Source0-md5: da98863cf8d538a083dd8958133f76a9 +Source1: http://developer.download.nvidia.com/compute/cuda/3_1/toolkit/%{name}_%{version}_linux_64_fedora12.run +# Source1-md5: 704b9b937526b758cf8e33817de64d35 URL: http://www.nvidia.com/object/cuda_home.html Requires: %{name}-libs = %{version}-%{release} Requires: qt4-assistant @@ -54,7 +58,7 @@ /bin/sh %{SOURCE1} --noexec --keep %endif -cp -a pkg/cudaprof/doc pkg/cudaprof/cudaprof +cp -a pkg/computeprof/doc pkg/computeprof/computeprof %build @@ -71,12 +75,15 @@ cp -a pkg/open64 $RPM_BUILD_ROOT%{_libdir}/cuda -cp -a pkg/cudaprof/doc/cudaprof.{html,q*} $RPM_BUILD_ROOT%{_libdir}/cuda/prof/doc -cp -a pkg/cudaprof/doc/help.png $RPM_BUILD_ROOT%{_libdir}/cuda/prof/doc -install pkg/cudaprof/bin/cudaprof $RPM_BUILD_ROOT%{_libdir}/cuda/prof/bin +%if %{with prof} +cp -a pkg/computeprof/doc/computeprof.{html,q*} $RPM_BUILD_ROOT%{_libdir}/cuda/prof/doc +cp -a pkg/computeprof/doc/help.png $RPM_BUILD_ROOT%{_libdir}/cuda/prof/doc +install pkg/computeprof/bin/computeprof $RPM_BUILD_ROOT%{_libdir}/cuda/prof/bin ln -s %{_libdir}/qt4/bin/assistant $RPM_BUILD_ROOT%{_libdir}/cuda/prof/bin/assistant -ln -s %{_libdir}/cuda/prof/bin/cudaprof $RPM_BUILD_ROOT%{_bindir}/cudaprof +ln -s %{_libdir}/cuda/prof/bin/computeprof $RPM_BUILD_ROOT%{_bindir}/computeprof +%endif + ln -s %{_libdir}/cuda/open64/bin/nvopencc $RPM_BUILD_ROOT%{_bindir}/nvopencc %clean @@ -88,11 +95,10 @@ %files %defattr(644,root,root,755) %doc pkg/doc/* pkg/bin/nvcc.profile -%doc pkg/cudaprof/CUDA_Visual_Profiler_Release_Notes.txt pkg/cudaprof/cudaprof %attr(755,root,root) %{_bindir}/bin2c %attr(755,root,root) %{_bindir}/cuda-gdb +%attr(755,root,root) %{_bindir}/cuda-memcheck %attr(755,root,root) %{_bindir}/cudafe* -%attr(755,root,root) %{_bindir}/cudaprof %attr(755,root,root) %{_bindir}/fatbin %attr(755,root,root) %{_bindir}/filehash %attr(755,root,root) %{_bindir}/nvcc @@ -100,10 +106,14 @@ %attr(755,root,root) %{_bindir}/ptxas %{_includedir}/cuda %dir %{_libdir}/cuda +%if %{with prof} +%doc pkg/computeprof/CUDA_Visual_Profiler_Release_Notes.txt pkg/computeprof/computeprof %dir %{_libdir}/cuda/prof %dir %{_libdir}/cuda/prof/bin +%attr(755,root,root) %{_bindir}/computeprof %attr(755,root,root) %{_libdir}/cuda/prof/bin/* %{_libdir}/cuda/prof/doc +%endif %dir %{_libdir}/cuda/open64 %dir %{_libdir}/cuda/open64/bin %dir %{_libdir}/cuda/open64/lib @@ -115,7 +125,7 @@ %files libs %defattr(644,root,root,755) -%attr(755,root,root) %ghost %{_libdir}/lib*.so.2 +%attr(755,root,root) %ghost %{_libdir}/lib*.so.3 %attr(755,root,root) %{_libdir}/lib*.so.*.* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -124,6 +134,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.5 2010/10/06 10:39:59 baggins +- up to 3.1 +- do not install profiler by default as it requires either Qt < 4.7 or + packaging additional set of internal qt libs + Revision 1.4 2010/02/16 15:06:44 baggins - rel 2 - install (required) open64 nvopencc ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cudatoolkit/cudatoolkit.spec?r1=1.4&r2=1.5&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
