- rel 10

[packages/xorg-driver-video-nvidia.git] / xorg-driver-video-nvidia.spec

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 6c0e67217c9a7247318c6aa6b6c0d0230d356b42..4f0fd1885540aef5825fb700c33ce0898cb35917 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -20,13 +20,14 @@
 %endif
 %define                no_install_post_check_so 1
 
+%define                rel 10
 %define                pname   xorg-driver-video-nvidia
 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:       290.10
-Release:       6
+Release:       %{rel}
 Epoch:         1
 License:       nVidia Binary
 Group:         X11
@@ -48,7 +49,7 @@ BuildRequires:        %{kgcc_package}
 BuildRequires: rpmbuild(macros) >= 1.379
 BuildRequires: sed >= 4.0
 BuildConflicts:        XFree86-nvidia
-Requires:      %{pname}-libs = %{epoch}:%{version}-%{release}
+Requires:      %{pname}-libs = %{epoch}:%{version}-%{rel}
 Requires:      xorg-xserver-server
 Requires:      xorg-xserver-server(videodrv-abi) <= 11.0
 Requires:      xorg-xserver-server(videodrv-abi) >= 2.0
@@ -121,7 +122,7 @@ 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:      %{pname}-libs = %{epoch}:%{version}-%{release}
+Requires:      %{pname}-libs = %{epoch}:%{version}-%{rel}
 Provides:      OpenGL-GLX-devel = 1.4
 Provides:      OpenGL-devel = 2.1
 Obsoletes:     X11-OpenGL-devel-base
@@ -145,7 +146,7 @@ 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}-%{release}
+Requires:      %{pname}-devel = %{epoch}:%{version}-%{rel}
 
 %description static
 Static XvMCNVIDIA library.
@@ -169,7 +170,7 @@ Summary:    Tools for advanced control of nVidia graphic cards
 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}-%{release}
+Requires:      %{pname} = %{epoch}:%{version}-%{rel}
 Suggests:      pkgconfig
 Obsoletes:     XFree86-driver-nvidia-progs
 
@@ -187,12 +188,12 @@ Summary:  nVidia kernel module for nVidia Architecture support
 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:       %{release}@%{_kernel_ver_str}
+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}
-Requires:      %{pname} = %{epoch}:%{version}-%{release}
+Requires:      %{pname} = %{epoch}:%{version}-%{rel}
 Provides:      X11-driver-nvidia(kernel)
 Obsoletes:     XFree86-nvidia-kernel
 
@@ -287,8 +288,13 @@ cp -p gl*.h $RPM_BUILD_ROOT%{_includedir}/GL
 
 ln -sf libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau/libvdpau_nvidia.so.1
 
+%ifarch %{x8664}
+echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia64.conf
+echo %{_libdir}/vdpau >>$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia64.conf
+%else
 echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf
 echo %{_libdir}/vdpau >>$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf
+%endif
 
 # OpenGL ABI for Linux compatibility
 ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so.1
@@ -320,8 +326,6 @@ NOTE: You must also install kernel module for this driver to work
   kernel-video-nvidia-%{version}
 
 EOF
-# until versioned SONAME is built for nvidia_drv.so, update symlink manually
-ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so
 
 %post libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
@@ -336,6 +340,7 @@ ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so
 %files
 %defattr(644,root,root,755)
 %doc LICENSE NVIDIA_Changelog README.txt
+%dir %{_libdir}/xorg/modules/extensions/nvidia
 %attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so.1
 %attr(755,root,root) %ghost %{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so
@@ -350,7 +355,7 @@ ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so
 %dir %{_sysconfdir}/OpenCL
 %dir %{_sysconfdir}/OpenCL/vendors
 %{_sysconfdir}/OpenCL/vendors/nvidia.icd
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia.conf
+%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