rpms/nvidia-settings/F-12 nvidia-settings-1.0-lm.patch, NONE, 1.1 nvidia-settings.spec, 1.2, 1.3

[Nicolas Chauvet]

Author: kwizart

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

Modified Files:
	nvidia-settings.spec 
Added Files:
	nvidia-settings-1.0-lm.patch 
Log Message:
Fix build


nvidia-settings-1.0-lm.patch:
 Makefile         |    2 +-
 Makefile.default |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE nvidia-settings-1.0-lm.patch ---
diff -up nvidia-settings-1.0/Makefile.default.lm nvidia-settings-1.0/Makefile.default
--- nvidia-settings-1.0/Makefile.default.lm	2010-02-25 14:44:29.000000000 +0100
+++ nvidia-settings-1.0/Makefile.default	2010-02-28 21:21:54.925079138 +0100
@@ -239,7 +239,7 @@ $(XNVCTRL_LIB):
 	$(MAKE) CFLAGS='$(ALL_CFLAGS)' LDFLAGS='$(ALL_LDFLAGS)' -C $(XNVCTRL_DIR)
 
 $(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_LIB) $(XF86PARSER_LIB)
-	$(CC) $(OBJS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(XNVCTRL_LIB) $(XF86PARSER_LIB) -o $@
+	$(CC) $(OBJS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(XNVCTRL_LIB) $(XF86PARSER_LIB) -lm -ldl -o $@
 
 .PHONY: $(XF86PARSER_LIB) dist clean clobber
 
diff -up nvidia-settings-1.0/Makefile.lm nvidia-settings-1.0/Makefile
--- nvidia-settings-1.0/Makefile.lm	2010-02-28 21:41:56.685076070 +0100
+++ nvidia-settings-1.0/Makefile	2010-02-28 21:41:58.532325821 +0100
@@ -238,7 +238,7 @@ $(XNVCTRL_LIB):
 	$(MAKE) CFLAGS='$(ALL_CFLAGS)' LDFLAGS='$(ALL_LDFLAGS)' -C $(XNVCTRL_DIR)
 
 $(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_LIB) $(XF86PARSER_LIB)
-	$(CC) $(OBJS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(XNVCTRL_LIB) $(XF86PARSER_LIB) -o $@
+	$(CC) $(OBJS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(XNVCTRL_LIB) $(XF86PARSER_LIB) -lm -ldl -o $@
 
 .PHONY: $(XF86PARSER_LIB) dist clean clobber
 


Index: nvidia-settings.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-12/nvidia-settings.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nvidia-settings.spec	28 Feb 2010 19:49:46 -0000	1.2
+++ nvidia-settings.spec	28 Feb 2010 20:56:03 -0000	1.3
@@ -7,7 +7,7 @@
 
 Name:           nvidia-settings
 Version:        1.0
-Release:        3.3%{?dist}
+Release:        3.4%{?dist}
 Summary:        Configure the NVIDIA graphics driver
 
 Group:          Applications/System
@@ -16,6 +16,7 @@
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?fedora} > 11 || 0%{?rhel} > 5
@@ -50,6 +51,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .default
+%patch1 -p1 -b .lm
 rm -rf src/libXNVCtrl/libXNVCtrl.a
 
 sed -i -e 's|# CFLAGS = -Wall|CFLAGS = $(INIT_CFLAGS)|' Makefile
@@ -85,7 +87,7 @@
 
 
 %changelog
-* Sun Feb 28 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.0-3.3
+* Sun Feb 28 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.0-3.4
 - Update internal version to 195.36.08
 - Built using xorg-x11-drv-nvidia-devel