Author: hawk Date: Sat Oct 20 11:31:27 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- updated to 100.14.19, updated URL, removed obsolete conftest.patch, cleanup
---- Files affected:
SPECS:
X11-driver-nvidia.spec (1.78.2.9.2.15 -> 1.78.2.9.2.16)
---- Diffs:
================================================================
Index: SPECS/X11-driver-nvidia.spec
diff -u SPECS/X11-driver-nvidia.spec:1.78.2.9.2.15
SPECS/X11-driver-nvidia.spec:1.78.2.9.2.16
--- SPECS/X11-driver-nvidia.spec:1.78.2.9.2.15 Mon Oct 15 10:26:44 2007
+++ SPECS/X11-driver-nvidia.spec Sat Oct 20 13:31:22 2007
@@ -16,7 +16,7 @@
%define alt_kernel grsecurity
%endif
#
-%define _nv_ver 100.14.09
+%define _nv_ver 100.14.19
%define _min_x11 6.7.0
%define _rel 55
#
@@ -42,26 +42,22 @@
Release: %{_rel}
License: nVidia Binary
Group: X11
-# why not pkg0!?
%if %{need_x86}
Source0:
http://us.download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}/NVIDIA-Linux-x86-%{_nv_ver}-pkg1.run
-# Source0-md5: 7b021b460ce1b1c533d97a51f2dde133
+# Source0-md5: d2f89f60cef8f9a0cc0ce228b46eeb8b
%endif
%if %{need_x8664}
Source1:
http://us.download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}/NVIDIA-Linux-x86_64-%{_nv_ver}-pkg1.run
-# Source1-md5: 60a6df9ff0bb02753908a83c324fd56d
+# Source1-md5: 3d702d7d67875b4b1e3095c2eb448b29
%endif
Source2: %{name}-settings.desktop
Source3: %{name}-xinitrc.sh
Patch0: %{name}-GL.patch
-Patch1: %{name}-conftest.patch
-# http://www.minion.de/files/1.0-6629/
-URL: http://www.nvidia.com/object/linux.html
+URL: http://www.nvidia.com/object/unix.html
%if %{with kernel}
%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >=
3:2.6.7}
%endif
BuildRequires: %{kgcc_package}
-#BuildRequires: X11-devel >= %{_min_x11} # disabled for now
BuildRequires: rpmbuild(macros) >= 1.330
BuildRequires: sed >= 4.0
BuildConflicts: XFree86-nvidia
@@ -200,7 +196,6 @@
%setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}-pkg1
%endif
%patch0 -p1
-#%patch1 -p1
sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
%build
@@ -239,12 +234,6 @@
$RPM_BUILD_ROOT%{_libdir}/modules/extensions
install usr/X11R6/lib/modules/libnvidia-wfb.so.%{version} \
$RPM_BUILD_ROOT%{_libdir}/modules
-%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
install usr/X11R6/lib/modules/drivers/nvidia_drv.so
$RPM_BUILD_ROOT%{_libdir}/modules/drivers
install usr/X11R6/lib/libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}
@@ -302,7 +291,6 @@
%defattr(644,root,root,755)
%doc LICENSE
%doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample}
-#%%lang(de) %doc usr/share/doc/README.DE
%attr(755,root,root) %{_libdir}/libGL.so.*.*
%attr(755,root,root) %{_libdir}/libGL.so
%attr(755,root,root) %{_libdir}/libGLcore.so.*.*
@@ -310,14 +298,6 @@
%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) %{_libdir}/modules/lib*
@@ -342,7 +322,6 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so
/usr/include/GL/*.h
-# -static
%{_libdir}/libXvMCNVIDIA.a
%files progs
@@ -362,6 +341,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.78.2.9.2.16 2007/10/20 11:31:22 hawk
+- updated to 100.14.19, updated URL, removed obsolete conftest.patch, cleanup
+
Revision 1.78.2.9.2.15 2007/10/15 08:26:44 glen
- rel 55 (kernel 2.6.16.55)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/X11-driver-nvidia.spec?r1=1.78.2.9.2.15&r2=1.78.2.9.2.16&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
