X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=xorg-driver-video-nvidia.spec;h=b20078c551380b234289cbc9b844f22957e19a2c;hb=6b9a06c56951314ac6bb9f2e638e511784271555;hp=6b15ef0bf47dd73367d3b8b9a5ff0ae5e455853a;hpb=bcf69910fd1b3059dac6196cd56458168971b394;p=packages%2Fxorg-driver-video-nvidia.git

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 6b15ef0..b20078c 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -10,7 +10,7 @@
 %define		no_install_post_strip 1
 #
 %define		_nv_ver		1.0
-%define		_nv_rel		8762
+%define		_nv_rel		8774
 %define		_min_x11	6.7.0
 %define		_rel		0.1
 #
@@ -37,17 +37,17 @@ License:	nVidia Binary
 Group:		X11
 %if %{need_x86}
 Source0:	http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run
-# Source0-md5:	86bcf4a3a9d441dff9e25b82ec8a6060
+# Source0-md5:	eb01a4372096ee7799e6560cf568c1c2
 %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}-pkg2.run
-# Source1-md5:	73a12a4933c57941a7a8b7c1186f8b93
+# Source1-md5:	1f569a860caf1c4314444536c7e659dd
 %endif
 Patch0:		X11-driver-nvidia-GL.patch
 Patch1:		X11-driver-nvidia-desktop.patch
 URL:		http://www.nvidia.com/object/linux.html
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.7}
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
 %endif
 BuildRequires:	%{kgcc_package}
 BuildRequires:	rpmbuild(macros) >= 1.213
@@ -126,7 +126,7 @@ Tools for advanced control of nVidia graphic cards.
 %description progs -l pl
 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
@@ -139,17 +139,17 @@ Requires:	dev >= 2.7.7-10
 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
+%description -n kernel%{_alt_kernel}-video-nvidia -l de
 Die nVidia-Architektur-Unterstützung für den Linux-Kern.
 
-%description -n kernel-video-nvidia -l pl
+%description -n kernel%{_alt_kernel}-video-nvidia -l pl
 Obs³uga architektury nVidia dla j±dra Linuksa. Pakiet wymagany przez
 sterownik nVidii dla Xorg/XFree86.
 
-%package -n kernel-smp-video-nvidia
+%package -n kernel%{_alt_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
@@ -161,13 +161,13 @@ Requires:	dev >= 2.7.7-10
 Provides:	X11-driver-nvidia(kernel)
 Obsoletes:	XFree86-nvidia-kernel
 
-%description -n kernel-smp-video-nvidia
+%description -n kernel%{_alt_kernel}-smp-video-nvidia
 nVidia Architecture support for Linux kernel SMP.
 
-%description -n kernel-smp-video-nvidia -l de
+%description -n kernel%{_alt_kernel}-smp-video-nvidia -l de
 Die nVidia-Architektur-Unterstützung für den Linux-Kern SMP.
 
-%description -n kernel-smp-video-nvidia -l pl
+%description -n kernel%{_alt_kernel}-smp-video-nvidia -l pl
 Obs³uga architektury nVidia dla j±dra Linuksa SMP. Pakiet wymagany
 przez sterownik nVidii dla Xorg/XFree86.
 
@@ -228,10 +228,10 @@ install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \
 	$RPM_BUILD_ROOT{%{_includedir}/GL,%{_libdir},%{_bindir},%{_mandir}/man1} \
 	$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
-install usr/bin/nvidia-{settings,xconfig} $RPM_BUILD_ROOT%{_bindir}
+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/doc/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
+install usr/share/pixmaps/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
 
 for f in \
 	usr/lib/tls/libnvidia-tls.so.%{version}		\
@@ -289,16 +289,16 @@ EOF
 
 %postun	-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
+%post	-n kernel%{_alt_kernel}-smp-video-nvidia
 %depmod %{_kernel_ver}smp
 
-%postun	-n kernel-smp-video-nvidia
+%postun	-n kernel%{_alt_kernel}-smp-video-nvidia
 %depmod %{_kernel_ver}smp
 
 %if %{with userspace}
@@ -320,12 +320,12 @@ EOF
 %endif
 
 %if %{with kernel}
-%files -n kernel-video-nvidia
+%files -n kernel%{_alt_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 -n kernel%{_alt_kernel}-smp-video-nvidia
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/misc/*.ko*
 %endif
@@ -343,6 +343,7 @@ EOF
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/nvidia-settings
 %attr(755,root,root) %{_bindir}/nvidia-xconfig
+%attr(755,root,root) %{_bindir}/nvidia-bug-report.sh
 %{_desktopdir}/nvidia-settings.desktop
 %{_mandir}/man1/nvidia-*
 %{_pixmapsdir}/nvidia-settings.png