X-Git-Url: http://git.pld-linux.org/?p=packages%2Fnvidia-settings.git;a=blobdiff_plain;f=nvidia-settings.spec;h=12a37e5c8c4d7634f69a7c3319c3d0f9f6d4356b;hp=6266975f6acfd1d4f62327050cbf85bca1bf1e81;hb=595ef4a;hpb=45091b3f97f36876110e0ebca61ce4bc18f8435e

diff --git a/nvidia-settings.spec b/nvidia-settings.spec
index 6266975..12a37e5 100644
--- a/nvidia-settings.spec
+++ b/nvidia-settings.spec
@@ -9,12 +9,12 @@ Summary:	Tool for configuring the NVIDIA driver
 Summary(pl.UTF-8):	Narzędzie do konfigurowania sterownika NVIDIA
 Name:		nvidia-settings
 # keep the version in sync with xorg-driver-video-nvidia.spec
-Version:	367.35
+Version:	470.74
 Release:	1
 License:	GPL v2 (with MIT parts)
 Group:		X11/Applications
-Source0:	ftp://download.nvidia.com/XFree86/nvidia-settings/%{name}-%{version}.tar.bz2
-# Source0-md5:	d8bd06ae3d0d3fc6383aeb6218c6fb2d
+Source0:	https://download.nvidia.com/XFree86/nvidia-settings/%{name}-%{version}.tar.bz2
+# Source0-md5:	03922ef16d4fefd44c062cade41156e1
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source3:	%{name}-autostart.desktop
@@ -119,29 +119,30 @@ sterowników NVIDIA.
 
 %build
 %if %{with libXNVCtrl}
+CFLAGS="%{rpmcppflags} %{rpmcflags} -fPIC" \
 %{__make} -C src/libXNVCtrl \
 	NV_VERBOSE=1 \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcppflags} %{rpmcflags} -fPIC"
+	OUTPUTDIR=.
 %endif
 
 %if %{with utils}
+CFLAGS="%{rpmcppflags} %{rpmcflags} -fPIC" \
 %{__make} -C samples \
 	NV_VERBOSE=1 \
 	CC="%{__cc}" \
 	OUTPUTDIR=$(pwd)/_out/utils \
-	X_CFLAGS="%{rpmcppflags} %{rpmcflags} -fPIC"
 %endif
 
 %if %{with nvidia_settings}
+CFLAGS="%{rpmcppflags} %{rpmcflags}" \
+LDFLAGS="%{rpmldflags}" \
 %{__make} -C src \
 	%{!?with_gtk3:BUILD_GTK3LIB=} \
 	NV_USE_BUNDLED_LIBJANSSON=0 \
 	NV_VERBOSE=1 \
 	STRIP_CMD=: \
-	CC="%{__cc}" \
-	X_CFLAGS="%{rpmcppflags} %{rpmcflags}" \
-	X_LDFLAGS="%{rpmldflags}"
+	CC="%{__cc}"
 
 %{__make} -C doc \
 	NV_VERBOSE=1
@@ -221,7 +222,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/nv-control-dvc
 %attr(755,root,root) %{_bindir}/nv-control-events
 %attr(755,root,root) %{_bindir}/nv-control-framelock
-%attr(755,root,root) %{_bindir}/nv-control-gvi
 %attr(755,root,root) %{_bindir}/nv-control-info
 %attr(755,root,root) %{_bindir}/nv-control-targets
 %attr(755,root,root) %{_bindir}/nv-control-warpblend