2:46 p.m.
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-settings/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9416/F-12
Modified Files:
.cvsignore sources
Added Files:
nvidia-settings-1.0-default.patch nvidia-settings.desktop
nvidia-settings.spec
Log Message:
Initial import for F-12
nvidia-settings-1.0-default.patch:
--- NEW FILE nvidia-settings-1.0-default.patch ---
diff -up nvidia-settings-1.0/Makefile.default nvidia-settings-1.0/Makefile
--- nvidia-settings-1.0/Makefile.default 2008-06-06 21:25:57.000000000 +0200
+++ nvidia-settings-1.0/Makefile 2008-06-06 21:30:15.000000000 +0200
@@ -102,10 +102,10 @@ LD_RUN_FLAG=-R/usr/X11R6/lib
else
ECHO=echo
define INSTALL_RULE
+ mkdir -p $(bindir)
$(INSTALL) -m 755 $(NVIDIA_SETTINGS) $(bindir)/$(NVIDIA_SETTINGS)
mkdir -p $(mandir)
$(INSTALL) -m 644 doc/$(MANPAGE) $(mandir)
- gzip -9f $(mandir)/$(MANPAGE)
endef
endif
@@ -118,7 +118,7 @@ X11_CFLAGS = $(X11_INC_DIRS)
GTK_CFLAGS := $(shell $(PKG_CONFIG) --cflags gtk+-2.0)
GTK_LDFLAGS := $(shell $(PKG_CONFIG) --libs gtk+-2.0)
-X11_LIBS := $(X11_LIB_DIRS) -Wl,-Bstatic -lXxf86vm -Wl,-Bdynamic -lX11 -lXext
+X11_LIBS := $(X11_LIB_DIRS) -Wl,-Bdynamic -lX11 -lXext -lXxf86vm
XNVCTRL_LIB := src/libXNVCtrl/libXNVCtrl.a
XNVCTRL_DIR := src/libXNVCtrl
@@ -195,7 +195,6 @@ DEPS := $(patsubst %.c,$(DEPS_DIR)/%.d,$
all: $(NVIDIA_SETTINGS) doc/$(MANPAGE)
install: all
- $(STRIP) $(NVIDIA_SETTINGS)
$(INSTALL_RULE)
$(OBJS_DIR)/%.o: %.c
--- NEW FILE nvidia-settings.desktop ---
[Desktop Entry]
Name=nVidia Display Settings
Comment=Configure the nVidia driver
Exec=nvidia-settings
Terminal=false
Icon=nvidia-settings
Type=Application
Categories=System;
--- NEW FILE nvidia-settings.spec ---
# 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
#Possible replacement/complement:
#http://willem.engen.nl/projects/disper/
Name: nvidia-settings
Version: 1.0
Release: 3.2%{?dist}
Summary: Configure the NVIDIA graphics driver
Group: Applications/System
License: MIT
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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
ExclusiveArch: i686 x86_64
%else 0%{?fedora} == 11
ExclusiveArch: i586 x86_64
%else
ExclusiveArch: i386 x86_64
%endif
BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel
#BuildRequires: libXNVCtrl-devel
BuildRequires: libXxf86vm-devel
BuildRequires: libXext-devel
BuildRequires: libXv-devel
#Needed for FBConfig table
#BuildRequires: xorg-x11-drv-nvidia-devel
BuildRequires: mesa-libGL-devel
%description
The nvidia-settings utility is a tool for configuring the NVIDIA graphics
driver. It operates by communicating with the NVIDIA X driver, querying
and updating state as appropriate.
This communication is done with the NV-CONTROL X extension.
nvidia-settings is compatible with driver up to %{nversion}.
%prep
%setup -q
%patch0 -p1 -b .default
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
%build
# no job control
make NVDEBUG=1 INIT_CFLAGS="$RPM_OPT_FLAGS -I/usr/include/nvidia
-DX_XF86VidModeGetGammaRampSize"
%install
rm -rf $RPM_BUILD_ROOT
make install ROOT=$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}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc doc/*.txt
%{_bindir}/nvidia-settings
%{_datadir}/applications/*nvidia-settings.desktop
%{_mandir}/man1/nvidia-settings.1.gz
%changelog
* Wed Oct 21 2009 kwizart < kwizart at gmail.com > - 1.0-3.1
- Update internal to 190.42
* Thu Jul 15 2009 kwizart < kwizart at gmail.com > - 1.0-3
- Update internal to 185.18.14
* Tue Mar 3 2009 kwizart < kwizart at gmail.com > - 1.0-2.1
- Update internal to 180.35
* Tue Jun 17 2008 kwizart < kwizart at gmail.com > - 1.0-2
- Update to 173.14.09
- Remove the locale patch
* Wed May 28 2008 kwizart < kwizart at gmail.com > - 1.0-1
- First Package for Fedora.
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Nov 2009 14:10:14 -0000 1.1
+++ .cvsignore 22 Nov 2009 14:46:40 -0000 1.2
@@ -0,0 +1 @@
+nvidia-settings-190.42.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Nov 2009 14:10:14 -0000 1.1
+++ sources 22 Nov 2009 14:46:40 -0000 1.2
@@ -0,0 +1 @@
+eb0cbb9f57ecf0d5a4a4804b7e257b10 nvidia-settings-190.42.tar.gz