packages: cudatoolkit/cudatoolkit.spec - US-ASCII in C description - verbos...

Mon Jan 10 21:35:18 CET 2011

Author: glen                         Date: Mon Jan 10 20:35:18 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- US-ASCII in C description
- verbose files, cosmetics
- update main group to be development

---- Files affected:
packages/cudatoolkit:
   cudatoolkit.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/cudatoolkit/cudatoolkit.spec
diff -u packages/cudatoolkit/cudatoolkit.spec:1.8 packages/cudatoolkit/cudatoolkit.spec:1.9

--- packages/cudatoolkit/cudatoolkit.spec:1.8	Tue Nov 16 20:26:59 2010
+++ packages/cudatoolkit/cudatoolkit.spec	Mon Jan 10 21:35:12 2011
@@ -2,14 +2,14 @@
 #
 # 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:	3.1
 Release:	3
 License:	nVidia Binary
-Group:		Applications
+Group:		Development/Tools
 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
@@ -22,9 +22,9 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-The CUDA™ architecture enables developers to leverage the massively
+The CUDA(tm) architecture enables developers to leverage the massively
 parallel processing power of NVIDIA GPUs, delivering the performance
-of NVIDIA’s world-renowned graphics processor technology to general
+of NVIDIA's world-renowned graphics processor technology to general
 purpose GPU Computing.
 
 With the CUDA architecture and tools, developers are achieving
@@ -37,8 +37,6 @@
 OpenCL and DirectCompute, and high level programming languages such as
 C/C++, Fortran, Java, Python, and the Microsoft .NET Framework.
 
-##description -l pl.UTF-8
-
 %package libs
 Summary:	NVIDIA CUDA libraries
 Summary(pl.UTF-8):	Biblioteki NVIDIA CUDA
@@ -57,27 +55,24 @@
 %else
 /bin/sh %{SOURCE1} --noexec --keep
 %endif
-
 cp -a pkg/computeprof/doc pkg/computeprof/computeprof
 
-%build
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/cuda/prof/{doc,bin}} \
 	$RPM_BUILD_ROOT{%{_mandir}/man{1,3},%{_includedir}/cuda} \
 	$RPM_BUILD_ROOT%{_sysconfdir}
 
-install pkg/bin/* $RPM_BUILD_ROOT%{_bindir}
+install -p pkg/bin/* $RPM_BUILD_ROOT%{_bindir}
 cp -a pkg/%{_lib}/* $RPM_BUILD_ROOT%{_libdir}
-install pkg/man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
-install pkg/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3
+cp -p pkg/man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p pkg/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3
 cp -a pkg/include/* $RPM_BUILD_ROOT%{_includedir}/cuda
 
 cp -a pkg/open64 $RPM_BUILD_ROOT%{_libdir}/cuda
 
 mv $RPM_BUILD_ROOT%{_bindir}/nvcc{,.bin}
-cat <<EOF >$RPM_BUILD_ROOT%{_sysconfdir}/nvcc.conf
+cat <<'EOF' >$RPM_BUILD_ROOT%{_sysconfdir}/nvcc.conf
 INCLUDES="-I/usr/include/cuda"
 LIBRARIES="-lcudart"
 
@@ -86,20 +81,19 @@
 PTXAS_FLAGS=
 EOF
 
-cat <<EOF >$RPM_BUILD_ROOT%{_bindir}/nvcc
+cat <<'EOF' >$RPM_BUILD_ROOT%{_bindir}/nvcc
 #!/bin/sh
-
 . %{_sysconfdir}/nvcc.conf
 
 export INCLUDES LIBRARIES CUDAFE_FLAGS OPENCC_FLAGS PTXAS_FLAG
 
-exec %{_bindir}/nvcc.bin "\$@"
+exec %{_bindir}/nvcc.bin "$@"
 EOF
 
 %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
+install -p 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/computeprof $RPM_BUILD_ROOT%{_bindir}/computeprof
@@ -110,7 +104,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post libs -p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
 %files
@@ -142,14 +136,20 @@
 %dir %{_libdir}/cuda/open64/lib
 %attr(755,root,root) %{_libdir}/cuda/open64/bin/*
 %attr(755,root,root) %{_libdir}/cuda/open64/lib/*
-%attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/libcublas.so
+%{_libdir}/libcudart.so
+%{_libdir}/libcufft.so
 %{_mandir}/man1/*
 %{_mandir}/man3/*
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %ghost %{_libdir}/lib*.so.3
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%ghost %{_libdir}/libcublas.so.3
+%attr(755,root,root) %{_libdir}/libcublas.so.*.*.*
+%ghost %{_libdir}/libcudart.so.3
+%attr(755,root,root) %{_libdir}/libcudart.so.*.*.*
+%ghost %{_libdir}/libcufft.so.3
+%attr(755,root,root) %{_libdir}/libcufft.so.*.*.*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -157,6 +157,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2011/01/10 20:35:12  glen
+- US-ASCII in C description
+- verbose files, cosmetics
+- update main group to be development
+
 Revision 1.8  2010/11/16 19:26:59  baggins
 - rel 3
 - export config vars in wrapper
@@ -185,4 +190,3 @@
 
 Revision 1.1  2010/02/16 14:36:45  baggins
 - initial revision
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cudatoolkit/cudatoolkit.spec?r1=1.8&r2=1.9&f=u

