Name        : nvidia                       Relocations: (not relocatable)
Version     : 7676                              Vendor: Penguin Liberation Front
Release     : 2plf                          Build Date: Sun 30 Oct 2005 
02:20:57 PM CET
Install Date: (not installed)               Build Host: ryu.zarb.org
Group       : System/Kernel and hardware    Source RPM: (none)
Size        : 31536555      License: Freeware
Signature   : (none)
Packager    : Sebastien Savarin <[EMAIL PROTECTED]>
URL         : http://download.nvidia.com/XFree86/Linux-x86/7676-7676
Summary     : NVIDIA dkms module for Kernel, Xorg Server and OpenGL libraries
Description :
Source package to build GLX and Kernel drivers for NVIDIA cards

---------------
trem <[EMAIL PROTECTED]> 7676-2plf
- add amd64
- fix lib for amd64
---------------

---------------
Index: nvidia.spec
===================================================================
RCS file: /home/projects/plf/cvs/SPECS/non-free/nvidia/nvidia.spec,v
retrieving revision 1.1
diff -u -r1.1 nvidia.spec
--- nvidia.spec 29 Oct 2005 17:17:03 -0000      1.1
+++ nvidia.spec 30 Oct 2005 13:29:42 -0000
@@ -2,13 +2,20 @@
 %define nameorig nvidia
 %define nversion 1_0
 %define nrelease 7676
+%ifarch x86_64
+%define pkg_rel pkg2
+%define arch x86_64
+%else
 %define pkg_rel pkg1
+%define arch x86
+%endif
 
 %define distsuffix plf
-%define release %mkrel 1
 
-%define module_name nvidia
+%define num_release 2
+%define release %mkrel %num_release
 
+%define module_name nvidia
 
 %define major %(echo %nversion|sed 's/_.*$//')
 %define minor %(echo %nversion|sed 's/^.*_//')
@@ -23,11 +30,13 @@
 Release:       %{release}
 Summary:       NVIDIA dkms module for Kernel, Xorg Server and OpenGL libraries
 License:       Freeware
-Source0:       
http://download.nvidia.com/XFree86/Linux-x86/1.0-%{nrelease}/NVIDIA-Linux-x86-%{nvversion}-%{nrelease}-%{pkg_rel}.run
+Source0:       
http://download.nvidia.com/XFree86/Linux-%{arch}/1.0-%{nrelease}/NVIDIA-Linux-%{arch}-%{nvversion}-%{nrelease}-%{pkg_rel}.run
 Source1:               nvidia.png
 Source10:       nvidia-16.png
 Source11:       nvidia-32.png
 Source12:       nvidia-48.png
+Source91: 
http://download.nvidia.com/XFree86/Linux-x86/1.0-%{nrelease}/NVIDIA-Linux-x86-%{nvversion}-%{nrelease}-pkg1.run
+Source92: 
http://download.nvidia.com/XFree86/Linux-x86_64/1.0-%{nrelease}/NVIDIA-Linux-x86_64-%{nvversion}-%{nrelease}-pkg2.run
 Url:           
http://download.nvidia.com/XFree86/Linux-x86/%{version}-%{nrelease}
 Group:         System/Kernel and hardware
 BuildRequires: kernel-source-2.6
@@ -80,12 +89,12 @@
 %description -n %{nameorig}-devel
 NVIDIA XFree86 4.x OpenGL 1.2 development libraries for RIVA TNT/TNT2
 and GeForce/Quadro based video cards.
-NVIDIA-Linux-x86
+NVIDIA-Linux-%{arch}
 
 %prep
 %setup -T -c
 sh %{SOURCE0} --extract-only
-pushd NVIDIA-Linux-x86-%{nvversion}-%{nrelease}-%{pkg_rel}
+pushd NVIDIA-Linux-%{arch}-%{nvversion}-%{nrelease}-%{pkg_rel}
 pushd %{source_path}/nv 
 rm -rf precompiled
 make clean
@@ -110,31 +119,31 @@
 ###            ###
 # OpenGL headers #
 ###            ###
-cp -a NVIDIA-Linux-x86-%{nvversion}-%{nrelease}-%{pkg_rel}%{_includedir}/* 
%{buildroot}%{_includedir}/nvidia
+cp -a NVIDIA-Linux-%{arch}-%{nvversion}-%{nrelease}-%{pkg_rel}%{_includedir}/* 
%{buildroot}%{_includedir}/nvidia
 
-install -m 755 
NVIDIA-Linux-x86-%{nvversion}-%{nrelease}-%{pkg_rel}%{_bindir}/nvidia-settings 
%{buildroot}/%{_bindir}
-install -m 755 
NVIDIA-Linux-x86-%{nvversion}-%{nrelease}-%{pkg_rel}%{_bindir}/nvidia-bug-report.sh
 %{buildroot}/%{_bindir}
-install -m 755 
NVIDIA-Linux-x86-%{nvversion}-%{nrelease}-%{pkg_rel}/nvidia-installer 
%{buildroot}/%{_bindir}
-install -m 644 
NVIDIA-Linux-x86-%{nvversion}-%{nrelease}-%{pkg_rel}/%{_docdir}/NVIDIA_Changelog
 .
-install -m 644 
NVIDIA-Linux-x86-%{nvversion}-%{nrelease}-%{pkg_rel}/%{_docdir}/nvidia-settings-user-guide.txt
 .
-install -m 644 
NVIDIA-Linux-x86-%{nvversion}-%{nrelease}-%{pkg_rel}/%{_docdir}/README.txt .
-install -m 644 
NVIDIA-Linux-x86-%{nvversion}-%{nrelease}-%{pkg_rel}/%{_docdir}/XF86Config.sample
 .
+install -m 755 
NVIDIA-Linux-%{arch}-%{nvversion}-%{nrelease}-%{pkg_rel}%{_bindir}/nvidia-settings
 %{buildroot}/%{_bindir}
+install -m 755 
NVIDIA-Linux-%{arch}-%{nvversion}-%{nrelease}-%{pkg_rel}%{_bindir}/nvidia-bug-report.sh
 %{buildroot}/%{_bindir}
+install -m 755 
NVIDIA-Linux-%{arch}-%{nvversion}-%{nrelease}-%{pkg_rel}/nvidia-installer 
%{buildroot}/%{_bindir}
+install -m 644 
NVIDIA-Linux-%{arch}-%{nvversion}-%{nrelease}-%{pkg_rel}/%{_docdir}/NVIDIA_Changelog
 .
+install -m 644 
NVIDIA-Linux-%{arch}-%{nvversion}-%{nrelease}-%{pkg_rel}/%{_docdir}/nvidia-settings-user-guide.txt
 .
+install -m 644 
NVIDIA-Linux-%{arch}-%{nvversion}-%{nrelease}-%{pkg_rel}/%{_docdir}/README.txt .
+install -m 644 
NVIDIA-Linux-%{arch}-%{nvversion}-%{nrelease}-%{pkg_rel}/%{_docdir}/XF86Config.sample
 .
 
 #dkms
-install  NVIDIA-Linux-x86-%{nvversion}-%{nrelease}-%{pkg_rel}/LICENSE 
%{buildroot}/%{source_path}/%{module_name}-%{nrelease}.%{release}
-cp -a  
NVIDIA-Linux-x86-%{nvversion}-%{nrelease}-%{pkg_rel}/%{source_path}/nv/* 
%{buildroot}/%{source_path}/%{module_name}-%{nrelease}.%{release}
+install  NVIDIA-Linux-%{arch}-%{nvversion}-%{nrelease}-%{pkg_rel}/LICENSE 
%{buildroot}/%{source_path}/%{module_name}-%{nrelease}.%{release}
+cp -a  
NVIDIA-Linux-%{arch}-%{nvversion}-%{nrelease}-%{pkg_rel}/%{source_path}/nv/* 
%{buildroot}/%{source_path}/%{module_name}-%{nrelease}.%{release}
 
 # place the libraries
-install -m 755 
NVIDIA-Linux-x86-%{nvversion}-%{nrelease}-%{pkg_rel}%{_libdir}/libGL.so.%{nvversion}.%{nrelease}
 %{buildroot}/%{_libdir}/
-install -m 755 
NVIDIA-Linux-x86-%{nvversion}-%{nrelease}-%{pkg_rel}%{_libdir}/libGLcore.so.%{nvversion}.%{nrelease}
 %{buildroot}/%{_libdir}/
-install -m 755 
NVIDIA-Linux-x86-%{nvversion}-%{nrelease}-%{pkg_rel}/%{_libdir}/libGL.la 
%{buildroot}/%{_libdir}/
-install -m 755 
NVIDIA-Linux-x86-%{nvversion}-%{nrelease}-%{pkg_rel}/%{_prefix}/X11R6/lib/modules/drivers/nvidia_drv.o
 %{buildroot}%{_prefix}/X11R6/lib/modules/drivers
-install 
NVIDIA-Linux-x86-%{nvversion}-%{nrelease}-%{pkg_rel}/%{_prefix}/X11R6/lib/modules/drivers/nvidia_drv.so
 %{buildroot}%{_prefix}/X11R6/lib/modules/drivers
-install -m 755 
NVIDIA-Linux-x86-%{nvversion}-%{nrelease}-%{pkg_rel}/%{_prefix}/X11R6/lib/modules/extensions/libglx.so.%{nvversion}.%{nrelease}
 %{buildroot}%{_prefix}/X11R6/lib/modules/extensions/
-install 
NVIDIA-Linux-x86-%{nvversion}-%{nrelease}-%{pkg_rel}/%{_libdir}/libnvidia-tls.so.%{nvversion}.%{nrelease}
 %{buildroot}/%{_libdir}/
-install -m 755 
NVIDIA-Linux-x86-%{nvversion}-%{nrelease}-%{pkg_rel}/%{_libdir}/tls/libnvidia-tls.so.%{nvversion}.%{nrelease}
 %{buildroot}/%{_libdir}/tls/
-install -m 755 
NVIDIA-Linux-x86-%{nvversion}-%{nrelease}-%{pkg_rel}/%{_prefix}/X11R6/lib/libXvMCNVIDIA.a
 %{buildroot}%{_prefix}/X11R6/lib/libXvMCNVIDIA.a;
-install -m 755 
NVIDIA-Linux-x86-%{nvversion}-%{nrelease}-%{pkg_rel}/%{_prefix}/X11R6/lib/libXvMCNVIDIA.so.%{nvversion}.%{nrelease}
 %{buildroot}%{_prefix}/X11R6/lib/
+install -m 755 
NVIDIA-Linux-%{arch}-%{nvversion}-%{nrelease}-%{pkg_rel}/usr/lib/libGL.so.%{nvversion}.%{nrelease}
 %{buildroot}/%{_libdir}/
+install -m 755 
NVIDIA-Linux-%{arch}-%{nvversion}-%{nrelease}-%{pkg_rel}/usr/lib/libGLcore.so.%{nvversion}.%{nrelease}
 %{buildroot}/%{_libdir}/
+install -m 755 
NVIDIA-Linux-%{arch}-%{nvversion}-%{nrelease}-%{pkg_rel}/usr/lib/libGL.la 
%{buildroot}/%{_libdir}/
+install -m 755 
NVIDIA-Linux-%{arch}-%{nvversion}-%{nrelease}-%{pkg_rel}/%{_prefix}/X11R6/lib/modules/drivers/nvidia_drv.o
 %{buildroot}%{_prefix}/X11R6/lib/modules/drivers
+install 
NVIDIA-Linux-%{arch}-%{nvversion}-%{nrelease}-%{pkg_rel}/%{_prefix}/X11R6/lib/modules/drivers/nvidia_drv.so
 %{buildroot}%{_prefix}/X11R6/lib/modules/drivers
+install -m 755 
NVIDIA-Linux-%{arch}-%{nvversion}-%{nrelease}-%{pkg_rel}/%{_prefix}/X11R6/lib/modules/extensions/libglx.so.%{nvversion}.%{nrelease}
 %{buildroot}%{_prefix}/X11R6/lib/modules/extensions/
+install 
NVIDIA-Linux-%{arch}-%{nvversion}-%{nrelease}-%{pkg_rel}/usr/lib/libnvidia-tls.so.%{nvversion}.%{nrelease}
 %{buildroot}/%{_libdir}/
+install -m 755 
NVIDIA-Linux-%{arch}-%{nvversion}-%{nrelease}-%{pkg_rel}/usr/lib/tls/libnvidia-tls.so.%{nvversion}.%{nrelease}
 %{buildroot}/%{_libdir}/tls/
+install -m 755 
NVIDIA-Linux-%{arch}-%{nvversion}-%{nrelease}-%{pkg_rel}/%{_prefix}/X11R6/lib/libXvMCNVIDIA.a
 %{buildroot}%{_prefix}/X11R6/lib/libXvMCNVIDIA.a;
+install -m 755 
NVIDIA-Linux-%{arch}-%{nvversion}-%{nrelease}-%{pkg_rel}/%{_prefix}/X11R6/lib/libXvMCNVIDIA.so.%{nvversion}.%{nrelease}
 %{buildroot}%{_prefix}/X11R6/lib/
 
 
 ###        ###
@@ -179,7 +188,7 @@
 AUTOINSTALL="YES"
 EOF
 # Fix bad perm
-chmod 755 %buildroot/%_prefix/src/nvidia-%{nrelease}.1plf/conftest.sh
+chmod 755 
%buildroot/%_prefix/src/nvidia-%{nrelease}.%{num_release}plf/conftest.sh
 
 %clean
 rm -rf %{buildroot}
@@ -188,7 +197,7 @@
 
 # if /usr/lib/libGL.so is pointing to libGL.so.1, we are upgrading.
 # This is good.  We just delete libGL.so.  We'll set it up later.
-# If not, leave it alone, we'll complain later
+# If not, leave it alone, we'lx86l complain later
 if [ -e %{_libdir}/libGL.so ]; then
   LIBGL=`ls -l %{_libdir}/libGL.so | sed 's/.*->[ ]*\(.*\)$/\1/'`
   if [ X$LIBGL = X"libGL.so.1" ]; then
@@ -445,5 +454,9 @@
 %{_prefix}/src/%{module_name}-%{nrelease}.%{release}
 
 %changelog
+* Sun Oct 30 2005 trem <[EMAIL PROTECTED]> 7676-2plf
+- add amd64
+- fix lib for amd64
+
 * Sat Oct 29 2005 Sebastien Savarin <[EMAIL PROTECTED]> 7676-1plf
 - First PLF release based on Thac spec with many fix


_______________________________________________
PLF-announce mailing list
[email protected]
https://www.zarb.org/mailman/listinfo/plf-announce

Reply via email to