- rel 1

[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 21a23c3265efc94a28b593bdf1ad2a3742567f7e..5440b1269f4a7a4a80472d6724d627ee06bd45ac 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -24,21 +24,21 @@
 %endif
 
 %define                pname           xorg-driver-video-nvidia
-%define                rel             4
+%define                rel             1
 
 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.53
+Version:       195.36.15
 Release:       %{rel}%{?with_multigl:.mgl}
 Epoch:         1
 License:       nVidia Binary
 Group:         X11
 Source0:       http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run
-# Source0-md5: 2e80419f6f9ac16beecd839874d0c5ab
+# Source0-md5: b09b45113585524b08b3b2acfdf4a290
 Source1:       http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
-# Source1-md5: 3d3e956366f9df0e4c64d2e0299d1029
+# Source1-md5: 82ff23e6d02b9f208c618ec17c60ca29
 Source2:       %{pname}-xinitrc.sh
 Source3:       gl.pc.in
 Patch0:                X11-driver-nvidia-GL.patch
@@ -53,7 +53,7 @@ BuildRequires:        sed >= 4.0
 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) <= 7.0
 Requires:      xorg-xserver-server(videodrv-abi) >= 2.0
 Provides:      xorg-xserver-module(glx)
 Obsoletes:     XFree86-driver-nvidia
@@ -231,21 +231,9 @@ rm -rf NVIDIA-Linux-x86*-%{version}-pkg*
 %patch1 -p1
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/src/nv/Makefile.kbuild
 
-mv usr/share/doc .
-mv usr/bin .
-mv usr/share/man/man1 man
-mv usr/share/applications xdg
-mv usr/share/pixmaps/* xdg
-mv usr/src/nv src
-mv usr/lib/tls lib
-mv usr/lib/* lib
-mv usr/X11R6/lib/modules lib/xorg
-mv usr/X11R6/lib/* lib
-mv usr/include .
-
 %build
 %if %{with kernel}
-cd src
+cd usr/src/nv
 ln -sf Makefile.kbuild Makefile
 cat >> Makefile <<'EOF'
 
@@ -267,18 +255,18 @@ install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \
 install -d $RPM_BUILD_ROOT{%{_libdir}/nvidia,%{_sysconfdir}/ld.so.conf.d}
 %endif
 
-install -p bin/nvidia-{settings,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir}
-cp -a man/nvidia-{settings,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1
-cp -a xdg/nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir}
-cp -a xdg/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
+install -p usr/bin/nvidia-{settings,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir}
+cp -a usr/share/man/man1/nvidia-{settings,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1
+cp -a usr/share/applications/nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir}
+cp -a usr/share/pixmaps/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh
 
 for f in \
-       lib/libnvidia-tls.so.%{version}         \
-       lib/libnvidia-cfg.so.%{version}         \
-       lib/libGL{,core}.so.%{version}          \
-       lib/libcuda.so.%{version}                       \
-       lib/libXvMCNVIDIA.so.%{version} \
+       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/X11R6/lib/libXvMCNVIDIA.so.%{version}       \
 ; do
 %if %{without multigl}
        install -p $f $RPM_BUILD_ROOT%{_libdir}
@@ -287,18 +275,18 @@ for f in \
 %endif
 done
 
-cp -a lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir}
-install -p lib/vdpau/libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau
+cp -a usr/X11R6/lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir}
+install -p usr/lib/vdpau/libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau
 
-install -p lib/xorg/extensions/libglx.so.%{version} \
+install -p usr/X11R6/lib/modules/extensions/libglx.so.%{version} \
        $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions
-install -p lib/xorg/drivers/nvidia_drv.so \
+install -p usr/X11R6/lib/modules/drivers/nvidia_drv.so \
        $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so.%{version}
-install -p lib/xorg/libnvidia-wfb.so.%{version} \
+install -p usr/X11R6/lib/modules/libnvidia-wfb.so.%{version} \
        $RPM_BUILD_ROOT%{_libdir}/xorg/modules
 
-cp -a include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
-cp -a include/cuda/*.h $RPM_BUILD_ROOT%{_includedir}/cuda
+cp -a usr/include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
+cp -a 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
@@ -328,7 +316,7 @@ ln -sf libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so
 %endif
 
 %if %{with kernel}
-%install_kernel_modules -m src/nvidia -d misc
+%install_kernel_modules -m usr/src/nv/nvidia -d misc
 %endif
 
 install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
@@ -377,7 +365,7 @@ ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so
 %files
 %defattr(644,root,root,755)
 %doc LICENSE
-%doc doc/{README.txt,NVIDIA_Changelog,XF86Config.sample}
+%doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample}
 %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
@@ -436,7 +424,7 @@ ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so
 
 %files doc
 %defattr(644,root,root,755)
-%doc doc/html/*
+%doc usr/share/doc/html/*
 
 %files progs
 %defattr(644,root,root,755)