+# TODO
+# - should -libs Require main package?
+# - solve this (shouldn't there be some obsoletes?):
+# error: xorg-driver-video-nvidia-169.12-3.i686 (cnfl Mesa-libGL) conflicts with installed Mesa-libGL-7.0.3-2.i686
+# error: xorg-driver-video-nvidia-169.12-3.i686 (cnfl Mesa-libGL) conflicts with installed Mesa-libGL-7.0.3-2.i686
#
# Conditional build:
%bcond_without dist_kernel # without distribution kernel
-%bcond_without smp # without smp packages
%bcond_without kernel # without kernel packages
-%bcond_without incall # include all tarballs
%bcond_without userspace # don't build userspace programs
+%bcond_with force_userspace # force userspace build (useful if alt_kernel is set)
+%bcond_with multigl # package libGL and libglx.so in a way allowing concurrent install with nvidia/fglrx drivers
%bcond_with verbose # verbose build (V=1)
-#
-%define _nv_ver 1.0
-%define _nv_rel 7676
-%define _min_x11 6.7.0
-%define _rel 1
-#
-%define need_x86 0
-%define need_x8664 0
-%if %{with incall}
-%define need_x86 1
-%define need_x8664 1
-%else
-%ifarch %{ix86}
-%define need_x86 1
+
+%if "%{_alt_kernel}" != "%{nil}"
+%undefine with_userspace
%endif
-%ifarch %{x8664}
-%define need_x8664 1
+%if %{with force_userspace}
+%define with_userspace 1
%endif
+%if %{without userspace}
+# nothing to be placed to debuginfo package
+%define _enable_debug_packages 0
%endif
-#
-Summary: Linux Drivers for nVidia TNT/TNT2/GeForce/Quadro Chips
-Summary(pl): Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/Quadro
-Name: X11-driver-nvidia
-Version: %{_nv_ver}.%{_nv_rel}
-Release: %{_rel}
+%define pname xorg-driver-video-nvidia
+%define rel 9
+
+Summary: Linux Drivers for nVidia GeForce/Quadro Chips
+Summary(hu.UTF-8): Linux meghajtók nVidia GeForce/Quadro chipekhez
+Summary(pl.UTF-8): Sterowniki do kart graficznych nVidia GeForce/Quadro
+Name: %{pname}
+Version: 190.42
+Release: %{rel}%{?with_multigl:.mgl}
+Epoch: 1
License: nVidia Binary
-Vendor: nVidia Corp.
-Group: X11/XFree86
-# why not pkg0!?
-%if %{need_x86}
-Source0: http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg0.run
-# Source0-md5: 2474c5513006668b0fba401e042dc009
-%endif
-%if %{need_x8664}
-Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg0.run
-# Source1-md5: 06a0a2d06c7f849510b4682d9d13946a
+Group: X11
+Source0: http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run
+# Source0-md5: f94806feee87de756d14fe3e9bcaf05a
+Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
+# Source1-md5: ae431ff849ec01446e6724f9fcfe3bb4
+Source2: %{pname}-xinitrc.sh
+Source3: gl.pc.in
+Patch0: X11-driver-nvidia-GL.patch
+Patch1: X11-driver-nvidia-desktop.patch
+URL: http://www.nvidia.com/object/unix.html
+%if %{with kernel}
+%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
%endif
-Patch0: %{name}-gcc34.patch
-Patch1: %{name}-GL.patch
-Patch2: %{name}-conftest.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-module-build >= 2.6.7}
BuildRequires: %{kgcc_package}
-BuildRequires: rpmbuild(macros) >= 1.213
+BuildRequires: rpmbuild(macros) >= 1.379
BuildRequires: sed >= 4.0
-BuildRequires: textutils
-#BuildRequires: X11-devel >= %{_min_x11} # disabled for now
-Requires: X11-Xserver
-Requires: X11-libs >= %{_min_x11}
-Requires: X11-modules >= %{_min_x11}
-Provides: X11-OpenGL-core
-Provides: X11-OpenGL-libGL
-Provides: XFree86-OpenGL-core
-Provides: XFree86-OpenGL-libGL
-Obsoletes: Mesa
-Obsoletes: X11-OpenGL-core
-Obsoletes: X11-OpenGL-libGL
-Obsoletes: XFree86-OpenGL-core
-Obsoletes: XFree86-OpenGL-libGL
+BuildConflicts: XFree86-nvidia
+Requires: %{pname}-libs = %{epoch}:%{version}-%{rel}
+Requires: xorg-xserver-server
+Requires: xorg-xserver-server(videodrv-abi) <= 6.0
+Requires: xorg-xserver-server(videodrv-abi) >= 2.0
+Provides: xorg-xserver-module(glx)
Obsoletes: XFree86-driver-nvidia
Obsoletes: XFree86-nvidia
Conflicts: XFree86-OpenGL-devel <= 4.2.0-3
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _noautoreqdep libGL.so.1 libGLcore.so.1
-%define _prefix /usr/X11R6
-%ifarch %{x8664}
-%define _libdir32 %{_prefix}/lib
-%endif
%description
-This driver set adds improved 2D functionality to the XFree86 4.0 X
-server as well as high performance OpenGL acceleration, AGP support,
-support for most flat panels, and 2D multiple monitor support.
-
-Hardware: nVidia TNT, TNT2, GeForce, or Quadro based graphics
-accelerator. The nVidia NV1 and RIVA 128/128ZX chips are supported in
-the base XFree86 4.0 install and are not supported by this driver set.
-
-Software: Linux kernel >= 2.2.12, XFree86 >= 4.0.
+This driver set adds improved 2D functionality to the Xorg X server as
+well as high performance OpenGL acceleration, AGP support, support for
+most flat panels, and 2D multiple monitor support. Supported hardware:
+modern NVIDIA GeForce (from GeForce2 MX) and Quadro (Quadro4 and up)
+based graphics accelerators.
+
+The older graphics chips are unsupported:
+- NV1 and RIVA 128/128ZX chips are supported in the base Xorg install
+ (nv driver)
+- TNT/TNT2/GeForce 256/GeForce2 Ultra/Quadro2 are suported by -legacy
+ drivers.
+
+%description -l hu.UTF-8
+Ez a meghajtó kibővíti az Xorg X szerver 2D működését OpenGL
+gyorsítással, AGP támogatással és támogatja a több monitort.
+Támogatott hardverek: modern NVIDIA GeForce (GeForce2 MX-től) és
+Quadro (Quadro4 és újabbak) alapú grafikai gyorsítók.
+
+A régekbbi grafikus chipek nem támogatottak:
+- NV1 és RIVA 128/128ZX chipek az alap Xorg telepítéssel (nv meghajtó)
+- TNT/TNT2/GeForce 256/GeForce2 Ultra/Quadro2 a -legacy driverekkel
+ támogatottak.
+
+%description -l pl.UTF-8
+Usprawnione sterowniki dla kart graficznych nVidia do serwera Xorg,
+dające wysokowydajną akcelerację OpenGL, obsługę AGP i wielu monitorów
+2D. Obsługują w miarę nowe karty NVIDIA GeForce (od wersji GeForce2
+MX) oraz Quadro (od wersji Quadro4).
+
+Starsze układy graficzne nie są obsługiwane przez ten pakiet:
+- NV1 i RIVA 128/128ZX są obsługiwane przez sterownik nv z Xorg
+- TNT/TNT2/GeForce 256/GeForce 2 Ultra/Quadro 2 są obsługiwane przez
+ sterowniki -legacy
+
+%package libs
+Summary: OpenGL (GL and GLX) Nvidia libraries
+Summary(pl.UTF-8): Biblioteki OpenGL (GL i GLX) Nvidia
+Group: X11/Development/Libraries
+#Requires: %{pname} = %{epoch}:%{version}-%{rel}
+Provides: OpenGL = 2.1
+Provides: OpenGL-GLX = 1.4
+%if %{without multigl}
+Obsoletes: Mesa
+%endif
+Obsoletes: X11-OpenGL-core < 1:7.0.0
+Obsoletes: X11-OpenGL-libGL < 1:7.0.0
+Obsoletes: XFree86-OpenGL-core < 1:7.0.0
+Obsoletes: XFree86-OpenGL-libGL < 1:7.0.0
+%if %{without multigl}
+Conflicts: Mesa-libGL
+%endif
-%description -l pl
-Usprawnione sterowniki dla kart graficznych nVidia do serwera XFree86
-4.0, daj±ce wysokowydajn± akceleracjê OpenGL, obs³ugê AGP i wielu
-monitorów 2D.
+%description libs
+NVIDIA OpenGL (GL and GLX only) implementation libraries.
-Obs³uguj± karty nVidia TNT/TNT2/GeForce/Quadro do serwera XFree86 4.0;
-Karty nVidia NV1 i Riva 128/128ZX s± obs³ugiwane przez sterownik nv z
-pakietów XFree86 - NIE s± obs³ugiwane przez ten pakiet.
+%description libs -l pl.UTF-8
+Implementacja OpenGL (tylko GL i GLX) firmy NVIDIA.
%package devel
-Summary: OpenGL for X11R6 development (only gl?.h)
-Summary(pl): Pliki nag³ówkowe OpenGL dla systemu X11R6 (tylko gl?.h)
+Summary: OpenGL (GL and GLX) header files
+Summary(hu.UTF-8): OpenGL (GL és GLX) fejléc fájlok
+Summary(pl.UTF-8): Pliki nagłówkowe OpenGL (GL i GLX)
Group: X11/Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Provides: OpenGL-devel-base
-Obsoletes: OpenGL-devel-base
+Requires: %{pname}-libs = %{epoch}:%{version}-%{rel}
+Provides: OpenGL-GLX-devel = 1.4
+Provides: OpenGL-devel = 2.1
+Obsoletes: X11-OpenGL-devel-base
+Obsoletes: XFree86-OpenGL-devel-base
Obsoletes: XFree86-driver-nvidia-devel
Conflicts: XFree86-OpenGL-devel < 4.3.99.902-0.3
%description devel
-Base headers (only gl?.h) for OpenGL for X11R6 for nvidia drivers.
+OpenGL header files (GL and GLX only) for NVIDIA OpenGL
+implementation.
-%description devel -l pl
-Podstawowe pliki nag³ówkowe (tylko gl?.h) OpenGL dla systemu X11R6 dla
-sterowników nvidii.
+%description devel -l hu.UTF-8
+OpenGL fejléc fájlok (csak GL és GLX) NVIDIA OpenGL implementációhoz.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe OpenGL (tylko GL i GLX) dla implementacji OpenGL
+firmy NVIDIA.
+
+%package static
+Summary: Static XvMCNVIDIA library
+Summary(hu.UTF-8): Statikus XwMCNVIDIA könyvtár
+Summary(pl.UTF-8): Statyczna biblioteka XvMCNVIDIA
+Group: X11/Development/Libraries
+Requires: %{pname}-devel = %{epoch}:%{version}-%{rel}
+
+%description static
+Static XvMCNVIDIA library.
+
+%description static -l hu.UTF-8
+Statikus XwMCNVIDIA könyvtár.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka XvMCNVIDIA.
%package progs
Summary: Tools for advanced control of nVidia graphic cards
-Summary(pl): Narzêdzia do zarz±dzania kartami graficznymi nVidia
+Summary(hu.UTF-8): Eszközök az nVidia grafikus kártyák beállításához
+Summary(pl.UTF-8): Narzędzia do zarządzania kartami graficznymi nVidia
Group: Applications/System
+Requires: %{pname} = %{epoch}:%{version}-%{rel}
+Suggests: pkgconfig
Obsoletes: XFree86-driver-nvidia-progs
-Requires: %{name} = %{version}-%{release}
%description progs
Tools for advanced control of nVidia graphic cards.
-%description progs -l pl
-Narzêdzia do zarz±dzania kartami graficznymi nVidia.
+%description progs -l hu.UTF-8
+Eszközök az nVidia grafikus kártyák beállításához.
+
+%description progs -l pl.UTF-8
+Narzędzia do zarządzania kartami graficznymi nVidia.
-%package -n kernel-video-nvidia
+%package -n kernel%{_alt_kernel}-video-nvidia
Summary: nVidia kernel module for nVidia Architecture support
-Summary(de): Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
-Summary(pl): Modu³ j±dra dla obs³ugi kart graficznych nVidia
-Version: %{_nv_ver}.%{_nv_rel}
-Release: %{_rel}@%{_kernel_ver_str}
+Summary(de.UTF-8): Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
+Summary(hu.UTF-8): nVidia Architektúra támogatás Linux kernelhez.
+Summary(pl.UTF-8): Moduł jądra dla obsługi kart graficznych nVidia
+Release: %{rel}@%{_kernel_ver_str}
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
Requires: dev >= 2.7.7-10
-%{?with_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:%requires_releq_kernel}
+Requires: %{pname} = %{epoch}:%{version}-%{rel}
Provides: X11-driver-nvidia(kernel)
Obsoletes: XFree86-nvidia-kernel
-%description -n kernel-video-nvidia
+%description -n kernel%{_alt_kernel}-video-nvidia
nVidia Architecture support for Linux kernel.
-%description -n kernel-video-nvidia -l de
-Die nVidia-Architektur-Unterstützung für den Linux-Kern.
-
-%description -n kernel-video-nvidia -l pl
-Obs³uga architektury nVidia dla j±dra Linuksa. Pakiet wymagany przez
-sterownik nVidii dla XFree86 4.
-
-%package -n kernel-smp-video-nvidia
-Summary: nVidia kernel module for nVidia Architecture support
-Summary(de): Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
-Summary(pl): Modu³ j±dra dla obs³ugi kart graficznych nVidia
-Release: %{_rel}@%{_kernel_ver_str}
-Group: Base/Kernel
-Requires(post,postun): /sbin/depmod
-Requires: dev >= 2.7.7-10
-%{?with_dist_kernel:%requires_releq_kernel_smp}
-Provides: X11-driver-nvidia(kernel)
-Obsoletes: XFree86-nvidia-kernel
-
-%description -n kernel-smp-video-nvidia
-nVidia Architecture support for Linux kernel SMP.
+%description -n kernel%{_alt_kernel}-video-nvidia -l de.UTF-8
+Die nVidia-Architektur-Unterstützung für den Linux-Kern.
-%description -n kernel-smp-video-nvidia -l de
-Die nVidia-Architektur-Unterstützung für den Linux-Kern SMP.
+%description -n kernel%{_alt_kernel}-video-nvidia -l hu.UTF-8
+nVidia Architektúra támogatás Linux kernelhez.
-%description -n kernel-smp-video-nvidia -l pl
-Obs³uga architektury nVidia dla j±dra Linuksa SMP. Pakiet wymagany
-przez sterownik nVidii dla XFree86 4.
+%description -n kernel%{_alt_kernel}-video-nvidia -l pl.UTF-8
+Obsługa architektury nVidia dla jądra Linuksa. Pakiet wymagany przez
+sterownik nVidii dla Xorg/XFree86.
%prep
cd %{_builddir}
-rm -rf NVIDIA-Linux-x86*-%{_nv_ver}-%{_nv_rel}-pkg*
+rm -rf NVIDIA-Linux-x86*-%{version}-pkg*
%ifarch %{ix86}
/bin/sh %{SOURCE0} --extract-only
-%setup -qDT -n NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg0
+%setup -qDT -n NVIDIA-Linux-x86-%{version}-pkg0
%else
/bin/sh %{SOURCE1} --extract-only
-%setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg0
+%setup -qDT -n NVIDIA-Linux-x86_64-%{version}-pkg0
%endif
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-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}
-cd usr/src/nv/
+cd usr/src/nv
ln -sf Makefile.kbuild Makefile
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
- if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
- exit 1
- fi
- rm -rf include
- install -d include/{linux,config}
- ln -sf %{_kernelsrcdir}/config-$cfg .config
- ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
- ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
- touch include/config/MARKER
- %{__make} -C %{_kernelsrcdir} clean \
- RCS_FIND_IGNORE="-name '*.ko' -o -name nv-kernel.o -o" \
- SYSSRC=%{_kernelsrcdir} \
- SYSOUT=$PWD \
- M=$PWD O=$PWD \
- %{?with_verbose:V=1}
- %{__make} -C %{_kernelsrcdir} modules \
- CC="%{__cc}" CPP="%{__cpp}" \
- SYSSRC=%{_kernelsrcdir} \
- SYSOUT=$PWD \
- M=$PWD O=$PWD \
- %{?with_verbose:V=1}
- mv nvidia.ko nvidia-$cfg.ko
-done
+cat >> Makefile <<'EOF'
+
+$(obj)/nv-kernel.o: $(src)/nv-kernel.o.bin
+ cp $< $@
+EOF
+mv nv-kernel.o{,.bin}
+%build_kernel_modules -m nvidia
%endif
%install
rm -rf $RPM_BUILD_ROOT
%if %{with userspace}
-install -d $RPM_BUILD_ROOT%{_libdir}/modules/{drivers,extensions} \
- $RPM_BUILD_ROOT{/usr/include/GL,/usr/%{_lib}/tls,%{_bindir}}
+install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \
+ $RPM_BUILD_ROOT{%{_includedir}/{GL,cuda},%{_libdir},%{_bindir},%{_mandir}/man1} \
+ $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d}
+%if %{with multigl}
+install -d $RPM_BUILD_ROOT{%{_libdir}/nvidia,%{_sysconfdir}/ld.so.conf.d}
+%endif
-ln -sf $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_prefix}/../lib
+install usr/bin/nvidia-{settings,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir}
+install usr/share/man/man1/nvidia-{settings,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1
+install usr/share/applications/nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir}
+install usr/share/pixmaps/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh
+
+for f in \
+ usr/lib/tls/libnvidia-tls.so.%{version} \
+ usr/lib/libnvidia-cfg.so.%{version} \
+ usr/lib/libGL{,core}.so.%{version} \
+ usr/lib/libcuda.so.%{version} \
+ usr/lib/libvdpau_nvidia.so.%{version} \
+ usr/X11R6/lib/libXvMCNVIDIA.so.%{version} \
+%if %{without multigl}
+ usr/X11R6/lib/libXvMCNVIDIA.a \
+; do
+ install $f $RPM_BUILD_ROOT%{_libdir}
+done
+%else
+; do
+ install $f $RPM_BUILD_ROOT%{_libdir}/nvidia
+done
+install usr/X11R6/lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir}
+%endif
-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/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
+ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions
+install usr/X11R6/lib/modules/drivers/nvidia_drv.so \
+ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so.%{version}
+install usr/X11R6/lib/modules/libnvidia-wfb.so.%{version} \
+ $RPM_BUILD_ROOT%{_libdir}/xorg/modules
-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
+install usr/include/cuda/*.h $RPM_BUILD_ROOT%{_includedir}/cuda
+
+ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libglx.so
+ln -sf nvidia_drv.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so
+
+%if %{with multigl}
+echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf
+
+# OpenGL ABI for Linux compatibility
+ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so.1
+ln -sf nvidia/libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so
+
+ln -sf nvidia/libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so
+ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1
+ln -sf nvidia/libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so
+%else
+# OpenGL ABI for Linux compatibility
+ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libGL.so.1
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
+ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA_dynamic.so.1
-# 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 libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so
+%endif
%endif
%if %{with kernel}
-cd usr/src/nv/
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-install nvidia-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/nvidia.ko
-%if %{with smp} && %{with dist_kernel}
-install nvidia-smp.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/nvidia.ko
-%endif
+%install_kernel_modules -m usr/src/nv/nvidia -d misc
%endif
+install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
+sed -e 's|@@prefix@@|%{_prefix}|g;s|@@libdir@@|%{_libdir}|g;s|@@includedir@@|%{_includedir}|g;s|@@version@@|%{version}|g' < %{SOURCE3} \
+ > $RPM_BUILD_ROOT%{_pkgconfigdir}/gl.pc
+
%clean
rm -rf $RPM_BUILD_ROOT
%post
-/sbin/ldconfig
-cat << EOF
-
- *******************************************************
- * *
- * NOTE: *
- * You must install: *
- * kernel(24)(-smp)-video-nvidia-%{version} *
- * for this driver to work *
- * *
- *******************************************************
+cat << 'EOF'
+NOTE: You must also install kernel module for this driver to work
+ kernel-video-nvidia-%{version}
+ kernel-desktop-video-nvidia-%{version}
+ kernel-laptop-video-nvidia-%{version}
+ kernel-vanilla-video-nvidia-%{version}
+
+Depending on which kernel brand you use.
EOF
+%if %{with multigl}
+if [ ! -e %{_libdir}/xorg/modules/extensions/libglx.so ]; then
+ ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so
+fi
+%else
+/sbin/ldconfig -N %{_libdir}/xorg/modules/extensions
+/sbin/ldconfig -N %{_libdir}/xorg/modules/drivers
+%endif
-%postun -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
-%post -n kernel-video-nvidia
+%post -n kernel%{_alt_kernel}-video-nvidia
%depmod %{_kernel_ver}
-%postun -n kernel-video-nvidia
+%postun -n kernel%{_alt_kernel}-video-nvidia
%depmod %{_kernel_ver}
-%post -n kernel-smp-video-nvidia
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel-smp-video-nvidia
-%depmod %{_kernel_ver}smp
-
%if %{with userspace}
%files
%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
+%doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample,html}
+%attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.*
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.*
+%attr(755,root,root) %ghost %{_libdir}/xorg/modules/extensions/libglx.so
+%attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/xorg/modules/drivers/nvidia_drv.so
+
+%files libs
+%if %{with multigl}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia.conf
+%dir %{_libdir}/nvidia
+%attr(755,root,root) %{_libdir}/nvidia/libGL.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/nvidia/libGL.so.1
+%attr(755,root,root) %{_libdir}/nvidia/libGLcore.so.*.*
+%attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1
+%attr(755,root,root) %{_libdir}/nvidia/libcuda.so.*.*
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-cfg.so.*.*
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-tls.so.*.*
+%attr(755,root,root) %{_libdir}/nvidia/libvdpau_nvidia.so.*.*
+%else
%attr(755,root,root) %{_libdir}/libGL.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libGL.so.1
+# symlink for binary apps which fail to conform Linux OpenGL ABI
+# (and dlopen libGL.so instead of libGL.so.1)
%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.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libXvMCNVIDIA_dynamic.so.1
+%attr(755,root,root) %{_libdir}/libcuda.so.*.*
+%attr(755,root,root) %{_libdir}/libnvidia-cfg.so.*.*
+%attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.*
+%attr(755,root,root) %{_libdir}/libvdpau_nvidia.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/extensions/libglx.so*
-%attr(755,root,root) %{_libdir}/modules/drivers/nvidia_drv.o
-%endif
-
-%if %{with kernel}
-%files -n kernel-video-nvidia
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/misc/*.ko*
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel-smp-video-nvidia
+%files devel
%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/*.ko*
-%endif
+%attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so
+%attr(755,root,root) %{_libdir}/libcuda.so
+%dir %{_includedir}/GL
+%{_includedir}/GL/gl.h
+%{_includedir}/GL/glext.h
+%{_includedir}/GL/glx.h
+%{_includedir}/GL/glxext.h
+%{_includedir}/cuda
+%if %{with multigl}
+%attr(755,root,root) %{_libdir}/libGL.so
%endif
+%{_pkgconfigdir}/gl.pc
-%if %{with userspace}
-%files devel
+%files static
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so
-/usr/include/GL/*.h
-# -static
%{_libdir}/libXvMCNVIDIA.a
%files progs
%defattr(644,root,root,755)
-%doc usr/share/doc/nvidia-settings-user-guide.txt
%attr(755,root,root) %{_bindir}/nvidia-settings
+%attr(755,root,root) %{_bindir}/nvidia-xconfig
+%attr(755,root,root) %{_bindir}/nvidia-bug-report.sh
+%attr(755,root,root) /etc/X11/xinit/xinitrc.d/*.sh
+%{_desktopdir}/nvidia-settings.desktop
+%{_mandir}/man1/nvidia-*
+%{_pixmapsdir}/nvidia-settings.png
+%endif
+
+%if %{with kernel}
+%files -n kernel%{_alt_kernel}-video-nvidia
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}/misc/*.ko*
%endif