SPECS: xorg-driver-video-nvidia-legacy.spec - cleanup, cosmetics, ...

shadzik shadzik at pld-linux.org
Fri Dec 1 15:03:18 CET 2006 

Author: shadzik                      Date: Fri Dec  1 14:03:18 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanup, cosmetics, adapterised and more Th optimizations

---- Files affected:
SPECS:
   xorg-driver-video-nvidia-legacy.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/xorg-driver-video-nvidia-legacy.spec
diff -u SPECS/xorg-driver-video-nvidia-legacy.spec:1.12 SPECS/xorg-driver-video-nvidia-legacy.spec:1.13
--- SPECS/xorg-driver-video-nvidia-legacy.spec:1.12	Fri Dec  1 14:38:52 2006
+++ SPECS/xorg-driver-video-nvidia-legacy.spec	Fri Dec  1 15:03:13 2006
@@ -18,8 +18,7 @@
 Version:	%{_nv_ver}.%{_nv_rel}
 Release:	%{_rel}
 License:	nVidia Binary
-Vendor:		nVidia Corp.
-Group:		X11/XFree86
+Group:		X11
 # why not pkg0!?
 Source0:	http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run
 # Source0-md5:	68cf7f155786daf6946b9daeb64c7a35
@@ -30,13 +29,10 @@
 Patch2:		%{_patchname}-verbose.patch
 # http://www.minion.de/files/1.0-6629/
 URL:		http://www.nvidia.com/object/linux.html
-BuildConflicts:	XFree86-nvidia
-BuildRequires:	grep
-%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 2.6.7}
 BuildRequires:	%{kgcc_package}
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 2.6.7}
 BuildRequires:	rpmbuild(macros) >= 1.330
-BuildRequires:	sed >= 4.0
-BuildRequires:	textutils
+BuildConflicts:	XFree86-nvidia
 Requires:	xorg-xserver-server
 Provides:	OpenGL = 1.5
 Provides:	OpenGL-GLX
@@ -101,8 +97,8 @@
 Summary:	Tools for advanced control of nVidia graphic cards
 Summary(pl):	Narzędzia do zarządzania kartami graficznymi nVidia
 Group:		Applications/System
-Obsoletes:	XFree86-driver-nvidia-progs
 Requires:	%{name} = %{version}-%{release}
+Obsoletes:	XFree86-driver-nvidia-progs
 
 %description progs
 Tools for advanced control of nVidia graphic cards.
@@ -170,7 +166,7 @@
 %if %{with verbose}
 %patch2 -p0
 %endif
-sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
+echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/src/nv/Makefile.kbuild
 
 %build
 %if %{with kernel}
@@ -188,36 +184,34 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_libdir}/modules/{drivers,extensions} \
-	$RPM_BUILD_ROOT{/usr/include/GL,/usr/%{_lib}/tls,%{_bindir}}
+$RPM_BUILD_ROOT{%{_includedir}/GL,%{_prefix}/%{_lib}/tls,%{_bindir}}
 
 ln -sf $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_prefix}/../lib
 
 install usr/bin/nvidia-settings $RPM_BUILD_ROOT%{_bindir}
-install usr/lib/libnvidia-tls.so.%{version} $RPM_BUILD_ROOT/usr/%{_lib}
-install usr/lib/tls/libnvidia-tls.so.%{version} $RPM_BUILD_ROOT/usr/%{_lib}/tls
-install usr/lib/libGL{,core}.so.%{version} $RPM_BUILD_ROOT%{_libdir}
+install usr/lib/libnvidia-tls.so.%{version} $RPM_BUILD_ROOT%{_prefix}/%{_lib}
 install usr/X11R6/lib/modules/extensions/libglx.so.%{version} \
 	$RPM_BUILD_ROOT%{_libdir}/modules/extensions
-%ifarch %{x8664}
-# support for running 32-bit OpenGL applications on 64-bit AMD64 Linux installations
-#install -d $RPM_BUILD_ROOT%{_libdir32}
-#install usr/lib32%{?with_tls:/tls}/libnvidia-tls.so.%{version} $RPM_BUILD_ROOT%{_libdir32}
-#install usr/lib32/libGL{,core}.so.%{version} $RPM_BUILD_ROOT%{_libdir32}
-%endif
+
+for f in \
+	usr/lib/tls/libnvidia-tls.so.%{version}		\
+	usr/lib/libGL{,core}.so.%{version}		\
+	usr/X11R6/lib/libXvMCNVIDIA.so.%{version}	\
+	usr/X11R6/lib/libXvMCNVIDIA.a			\
+; do
+	install $f $RPM_BUILD_ROOT%{_libdir}
+done
 
 install usr/X11R6/lib/modules/drivers/nvidia_drv.o $RPM_BUILD_ROOT%{_libdir}/modules/drivers
-install usr/X11R6/lib/libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}
-install usr/X11R6/lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir}
-install usr/include/GL/*.h	$RPM_BUILD_ROOT/usr/include/GL
-#install usr/bin/nvidia-settings $RPM_BUILD_ROOT%{_bindir}
+install usr/include/GL/*.h	$RPM_BUILD_ROOT%{_includedir}/GL
 
 ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so
 ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/modules/extensions/libglx.so
 ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so
 
 # OpenGL ABI for Linux compatibility
-ln -sf %{_libdir}/libGL.so.1 $RPM_BUILD_ROOT/usr/%{_lib}/libGL.so.1
-ln -sf %{_libdir}/libGL.so $RPM_BUILD_ROOT/usr/%{_lib}/libGL.so
+ln -sf %{_libdir}/libGL.so.1 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libGL.so.1
+ln -sf %{_libdir}/libGL.so $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libGL.so
 
 %if %{with kernel}
 %install_kernel_modules -m usr/src/nv/nvidia -d misc
@@ -264,19 +258,9 @@
 %attr(755,root,root) %{_libdir}/libGL.so
 %attr(755,root,root) %{_libdir}/libGLcore.so.*.*
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so.*.*
-%dir /usr/%{_lib}/tls
-%attr(755,root,root) /usr/%{_lib}/libnvidia-tls.so.*.*.*
-%attr(755,root,root) /usr/%{_lib}/tls/libnvidia-tls.so.*.*.*
-%ifarch %{x8664}
-# support for running 32-bit OpenGL applications on 64-bit AMD64 Linux installations
-#dir %{_libdir32}
-#attr(755,root,root) %{_libdir32}/libGL.so.*.*
-#attr(755,root,root) %{_libdir32}/libGLcore.so.*.*
-#attr(755,root,root) %{_libdir32}/libXvMCNVIDIA.so.*.*
-#attr(755,root,root) %{_libdir32}/libnvidia-tls.so.*.*.*
-%endif
-%attr(755,root,root) /usr/%{_lib}/libGL.so.1
-%attr(755,root,root) /usr/%{_lib}/libGL.so
+%attr(755,root,root) %{_prefix}/%{_lib}/libnvidia-tls.so.*.*.*
+%attr(755,root,root) %{_prefix}/%{_lib}/libGL.so.1
+%attr(755,root,root) %{_prefix}/%{_lib}/libGL.so
 %attr(755,root,root) %{_libdir}/modules/extensions/libglx.so*
 %attr(755,root,root) %{_libdir}/modules/drivers/nvidia_drv.o*
 
@@ -295,7 +279,7 @@
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so
-/usr/include/GL/*.h
+%{_includedir}/GL/*.h
 # -static
 %{_libdir}/libXvMCNVIDIA.a
 
@@ -309,6 +293,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2006/12/01 14:03:13  shadzik
+- cleanup, cosmetics, adapterised and more Th optimizations
+
 Revision 1.12  2006/12/01 13:38:52  shadzik
 - package nvidia_drv.o.gz instead of not existing *.o
 - call it everywhere *nvidia-legacy
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xorg-driver-video-nvidia-legacy.spec?r1=1.12&r2=1.13&f=u

More information about the pld-cvs-commit mailing list