rpms/nvidia-settings/F-11 .cvsignore, 1.2, 1.3 nvidia-settings.spec, 1.1, 1.2 sources, 1.2, 1.3

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/nvidia-settings/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6055/F-11

Modified Files:
	.cvsignore nvidia-settings.spec sources 
Log Message:
- Update internal to 195.36.24
- Avoid failure on NV_CTRL_NO_SCANOUT when not supported in legacy drivers. 



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Nov 2009 14:48:13 -0000	1.2
+++ .cvsignore	28 Apr 2010 21:44:52 -0000	1.3
@@ -1 +1 @@
-nvidia-settings-190.42.tar.gz
+nvidia-settings-195.36.24.tar.gz


Index: nvidia-settings.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-11/nvidia-settings.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nvidia-settings.spec	22 Nov 2009 14:48:13 -0000	1.1
+++ nvidia-settings.spec	28 Apr 2010 21:44:52 -0000	1.2
@@ -1,13 +1,13 @@
 # We use the driver version as a snapshot internal number
 # The real version of the package remains 1.0
 # This will prevent missunderstanding and versioning changes on the nvidia driver
-%global nversion 190.42
+%global nversion 195.36.24
 #Possible replacement/complement:
 #http://willem.engen.nl/projects/disper/
 
 Name:           nvidia-settings
 Version:        1.0
-Release:        3.2%{?dist}
+Release:        4%{?dist}
 Summary:        Configure the NVIDIA graphics driver
 
 Group:          Applications/System
@@ -16,6 +16,8 @@
 Source0:        ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-%{nversion}.tar.gz
 Source1:        nvidia-settings.desktop
 Patch0:         nvidia-settings-1.0-default.patch
+Patch1:         nvidia-settings-1.0-lm.patch
+Patch2:         03_do_not_exit_on_no_scanout.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?fedora} > 11 || 0%{?rhel} > 5
@@ -50,6 +52,8 @@
 %prep
 %setup -q
 %patch0 -p1 -b .default
+%patch1 -p1 -b .lm
+%patch2 -p1 -b .noscanout
 rm -rf src/libXNVCtrl/libXNVCtrl.a
 
 sed -i -e 's|# CFLAGS = -Wall|CFLAGS = $(INIT_CFLAGS)|' Makefile
@@ -85,6 +89,14 @@
 
 
 %changelog
+* Wed Apr 28 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.0-4
+- Update internal to 195.36.24
+- Avoid failure on NV_CTRL_NO_SCANOUT when not supported in legacy drivers. 
+
+* Sun Feb 28 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.0-3.4
+- Update internal version to 195.36.08
+- Add patch for -lm
+
 * Wed Oct 21 2009 kwizart < kwizart at gmail.com > - 1.0-3.1
 - Update internal to 190.42
 


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Nov 2009 14:48:13 -0000	1.2
+++ sources	28 Apr 2010 21:44:52 -0000	1.3
@@ -1 +1 @@
-eb0cbb9f57ecf0d5a4a4804b7e257b10  nvidia-settings-190.42.tar.gz
+43008cf2cec84fa27ee6f315845d50f7  nvidia-settings-195.36.24.tar.gz