[svn] r5449 - trunk/rpms/nvidia-x11-drv

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Thu May 31 12:50:07 CEST 2007


Author: thias
Date: 2007-05-31 12:50:06 +0200 (Thu, 31 May 2007)
New Revision: 5449

Added:
   trunk/rpms/nvidia-x11-drv/nvidia-x11-drv-1.0.9755-noxensanitycheck.patch
Modified:
   trunk/rpms/nvidia-x11-drv/nvidia-x11-drv.spec
Log:
Commit pending changes of nvidia-x11-drv up to 1.0-9762.


Added: trunk/rpms/nvidia-x11-drv/nvidia-x11-drv-1.0.9755-noxensanitycheck.patch
===================================================================
--- trunk/rpms/nvidia-x11-drv/nvidia-x11-drv-1.0.9755-noxensanitycheck.patch	                        (rev 0)
+++ trunk/rpms/nvidia-x11-drv/nvidia-x11-drv-1.0.9755-noxensanitycheck.patch	2007-05-31 10:50:06 UTC (rev 5449)
@@ -0,0 +1,12 @@
+diff -Naupr tmp.orig/usr/src/nv/Makefile.kbuild tmp/usr/src/nv/Makefile.kbuild
+--- usr/src/nv/Makefile.kbuild.orig	2007-02-27 08:59:25.000000000 +0100
++++ usr/src/nv/Makefile.kbuild	2007-03-15 13:48:42.000000000 +0100
+@@ -292,7 +292,7 @@ xen-sanity-check:
+ # the "package-install" target below.
+ #
+ 
+-module: cc-version-check xen-sanity-check rivafb-sanity-check nvidiafb-sanity-check
++module: cc-version-check rivafb-sanity-check nvidiafb-sanity-check
+ 	@if [ -z "$(PATCHLEVEL)" ]; then \
+ 	  echo "failed to determine PATCHLEVEL!"; \
+ 	  exit 1; \

Modified: trunk/rpms/nvidia-x11-drv/nvidia-x11-drv.spec
===================================================================
--- trunk/rpms/nvidia-x11-drv/nvidia-x11-drv.spec	2007-05-31 10:46:59 UTC (rev 5448)
+++ trunk/rpms/nvidia-x11-drv/nvidia-x11-drv.spec	2007-05-31 10:50:06 UTC (rev 5449)
@@ -4,7 +4,7 @@
 # ExclusiveDist: fc6 el5
 
 %define majmin          1.0
-%define relver          9755
+%define relver          9762
 %define nvidialibdir    %{_libdir}/nvidia
 %define nvidialib32dir  %{_prefix}/lib/nvidia
 %define desktop_vendor  rpmforge
@@ -32,6 +32,7 @@
 Patch0: NVIDIA_kernel-1.0-9625-NOSMBUS.diff.txt
 # http://www.nvnews.net/vbulletin/showthread.php?t=77597
 Patch1: NVIDIA-Linux-1.0-9629-xenrt.patch
+Patch2: nvidia-x11-drv-1.0.9755-noxensanitycheck.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 # Required for proper dkms operation
 Requires: gcc, make
@@ -70,6 +71,7 @@
 %{__rm} -rf tmp/
 %patch0 -p0
 %patch1 -p0
+%patch2 -p0
 
 
 %build
@@ -116,6 +118,8 @@
 %{__mkdir_p} %{buildroot}%{_libdir}/xorg/modules/extensions/nvidia/
 %{__install} -p -m 0755 usr/X11R6/lib/modules/extensions/libglx.so.%{version} \
     %{buildroot}%{_libdir}/xorg/modules/extensions/nvidia/libglx.so
+%{__install} -p -m 0755 usr/X11R6/lib/modules/libnvidia-wfb.so.%{version} \
+    %{buildroot}%{_libdir}/xorg/modules/libwfb.so
 
 # Install GL and tls libs
 %{__mkdir_p} %{buildroot}%{nvidialibdir}/tls/
@@ -194,9 +198,9 @@
 %endif
 
 # Install profile.d files
-%{__install} -D -p -m 0755 %{SOURCE2} \
+%{__install} -D -p -m 0644 %{SOURCE2} \
     %{buildroot}%{_sysconfdir}/profile.d/nvidia.sh
-%{__install} -D -p -m 0755 %{SOURCE3} \
+%{__install} -D -p -m 0644 %{SOURCE3} \
     %{buildroot}%{_sysconfdir}/profile.d/nvidia.csh
 
 # Install X configuration script
@@ -264,6 +268,7 @@
 %{_libdir}/xorg/modules/drivers/nvidia_drv.so
 %dir %{_libdir}/xorg/modules/extensions/nvidia/
 %{_libdir}/xorg/modules/extensions/nvidia/libglx.so
+%{_libdir}/xorg/modules/libwfb.so
 # Tools and utilities
 %{_sysconfdir}/profile.d/*
 %{_bindir}/*
@@ -283,8 +288,18 @@
 
 
 %changelog
+* Fri May 18 2007 Matthias Saou <http://freshrpms.net/> 1.0.9762-1
+- Update to 1.0-9762.
+
+* Fri May 18 2007 Matthias Saou <http://freshrpms.net/> 1.0.9755-3
+- Include missing libwfb.so (Simone Caronni).
+
+* Thu Mar 15 2007 Matthias Saou <http://freshrpms.net/> 1.0.9755-2
+- Disable Xen sanity check since it fails, but the module actually works.
+
 * Mon Mar 12 2007 Matthias Saou <http://freshrpms.net/> 1.0.9755-1
 - Update to 1.0-9755 (stable).
+- Change profile.d sourced files from mode 755 to 644, as they should be.
 
 * Fri Dec 22 2006 Matthias Saou <http://freshrpms.net/> 1.0.9746-1
 - Update to 1.0-9746 (stable).




More information about the commits mailing list