3:01 p.m.
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-settings/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25485/F-13
Modified Files:
.cvsignore nvidia-settings.spec sources
Added Files:
nvidia-settings-256.35-validate.patch
Removed Files:
03_do_not_exit_on_no_scanout.patch
nvidia-settings-1.0-default.patch nvidia-settings-1.0-lm.patch
nvidia-settings.desktop
Log Message:
Update to 256.35
nvidia-settings-256.35-validate.patch:
nvidia-settings.desktop | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE nvidia-settings-256.35-validate.patch ---
diff -up nvidia-settings-256.35/doc/nvidia-settings.desktop.validate
nvidia-settings-256.35/doc/nvidia-settings.desktop
--- nvidia-settings-256.35/doc/nvidia-settings.desktop.validate 2010-06-17
05:02:48.000000000 +0200
+++ nvidia-settings-256.35/doc/nvidia-settings.desktop 2010-07-10 16:43:47.000000000
+0200
@@ -3,9 +3,9 @@ Type=Application
Encoding=UTF-8
Name=NVIDIA X Server Settings
Comment=Configure NVIDIA X Server Settings
-Exec=__UTILS_PATH__/nvidia-settings
-Icon=__PIXMAP_PATH__/nvidia-settings.png
-Categories=__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__
+Exec=nvidia-settings
+Icon=nvidia-settings
+Categories=System;Settings;
# Translations provided by Sun Microsystems
Name[de]=NVIDIA X-Server-Einstellungen
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-13/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 28 Apr 2010 21:44:51 -0000 1.4
+++ .cvsignore 10 Jul 2010 15:01:03 -0000 1.5
@@ -1 +1 @@
-nvidia-settings-195.36.24.tar.gz
+nvidia-settings-256.35.tar.bz2
Index: nvidia-settings.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-13/nvidia-settings.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nvidia-settings.spec 28 Apr 2010 21:44:51 -0000 1.4
+++ nvidia-settings.spec 10 Jul 2010 15:01:03 -0000 1.5
@@ -1,23 +1,20 @@
# 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 195.36.24
+%global nversion 256.35
#Possible replacement/complement:
#http://willem.engen.nl/projects/disper/
Name: nvidia-settings
Version: 1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Configure the NVIDIA graphics driver
Group: Applications/System
-License: MIT
+License: GPLv2+
URL: ftp://download.nvidia.com/XFree86/nvidia-settings/
-Source0:
ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-%{nvers...
-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
+Source0:
ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-%{nvers...
+Patch0: nvidia-settings-256.35-validate.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
@@ -39,6 +36,8 @@
#BuildRequires: xorg-x11-drv-nvidia-devel
BuildRequires: mesa-libGL-devel
+Provides: %{name}-nversion = %{nversion}
+
%description
@@ -50,30 +49,35 @@
nvidia-settings is compatible with driver up to %{nversion}.
%prep
-%setup -q
-%patch0 -p1 -b .default
-%patch1 -p1 -b .lm
-%patch2 -p1 -b .noscanout
+%setup -q -n nvidia-settings-%{nversion}
+%patch0 -p1 -b .validate
rm -rf src/libXNVCtrl/libXNVCtrl.a
-sed -i -e 's|# CFLAGS = -Wall|CFLAGS = $(INIT_CFLAGS)|' Makefile
-sed -i -e 's|# X11R6_DIR = /usr/X11R6|X11R6_DIR = %{_prefix}|' Makefile
-sed -i -e 's|CFLAGS = -Wall -g|CFLAGS = $(RPM_OPT_FLAGS)|'
src/XF86Config-parser/Makefile
+sed -i -e 's|/usr/local|$(DESTDIR)/%{_prefix}|g' utils.mk
+sed -i -e 's|-lXxf86vm|-lXxf86vm -ldl -lm|g' Makefile
%build
# no job control
-make NVDEBUG=1 INIT_CFLAGS="$RPM_OPT_FLAGS -I/usr/include/nvidia
-DX_XF86VidModeGetGammaRampSize"
+pushd src/libXNVCtrl
+ make
+popd
+make \
+ NVDEBUG=1 \
+ NV_VERBOSE=1 \
+ X_LDFLAGS="-L%{_libdir}" \
+ CC_ONLY_CFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
-make install ROOT=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+
# Desktop entry for nvidia-settings
desktop-file-install --vendor "" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
- %{SOURCE1}
+ doc/nvidia-settings.desktop
%clean
@@ -89,6 +93,11 @@
%changelog
+* Sat Jul 10 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-5
+- Update internal to 256.35
+- Use upstream desktop file (completed)
+- Provides %%{name}-nversion internal
+
* Wed Apr 28 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.0-4
- Update internal to 195.36.24
- Avoid failure on NV_CTRL_NO_SCANOUT when not supported in legacy drivers.
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-13/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 28 Apr 2010 21:44:51 -0000 1.4
+++ sources 10 Jul 2010 15:01:03 -0000 1.5
@@ -1 +1 @@
-43008cf2cec84fa27ee6f315845d50f7 nvidia-settings-195.36.24.tar.gz
+125d6c4e9eb093814cb56440fe2d78ab nvidia-settings-256.35.tar.bz2
--- 03_do_not_exit_on_no_scanout.patch DELETED ---
--- nvidia-settings-1.0-default.patch DELETED ---
--- nvidia-settings-1.0-lm.patch DELETED ---
--- nvidia-settings.desktop DELETED ---