Author: glen Date: Sun May 6 14:43:27 2012 GMT Module: packages Tag: NVIDIA_173 ---- Log message: - build nv-control utils from samples dir
---- Files affected: packages/nvidia-settings: nvidia-settings.spec (1.21.2.3 -> 1.21.2.4) ---- Diffs: ================================================================ Index: packages/nvidia-settings/nvidia-settings.spec diff -u packages/nvidia-settings/nvidia-settings.spec:1.21.2.3 packages/nvidia-settings/nvidia-settings.spec:1.21.2.4 --- packages/nvidia-settings/nvidia-settings.spec:1.21.2.3 Sun May 6 16:33:23 2012 +++ packages/nvidia-settings/nvidia-settings.spec Sun May 6 16:43:22 2012 @@ -2,6 +2,7 @@ # # Conditional build: %bcond_without nvidia_settings # build the main package +%bcond_without utils # build utils from samples dir %bcond_without libXNVCtrl # build libXNVCtrl for http://websvn.kde.org/trunk/kdenonbeta/nvidia/ Summary: Tool for configuring the NVIDIA driver @@ -88,18 +89,22 @@ %build %if %{with libXNVCtrl} %{__make} -C src/libXNVCtrl \ - NV_VERBOSE=1 \ CC="%{__cc}" \ - X_CFLAGS="%{rpmcppflags} %{rpmcflags} -fPIC" + LOCAL_CFLAGS="%{rpmcppflags} %{rpmcflags} -fPIC" +%endif + +%if %{with utils} +%{__make} -C samples \ + CC="%{__cc}" \ + LOCAL_CFLAGS="%{rpmcppflags} %{rpmcflags} -fPIC" %endif %if %{with nvidia_settings} %{__make} \ - NV_VERBOSE=1 \ - STRIP_CMD=: \ + STRIP=: \ CC="%{__cc}" \ - X_CFLAGS="%{rpmcppflags} %{rpmcflags}" \ - X_LDFLAGS="%{rpmldflags}" + LOCAL_CFLAGS="%{rpmcppflags} %{rpmcflags}" \ + LDFLAGS="%{rpmldflags}" %endif %install @@ -117,9 +122,22 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/libXNVCtrl-%{version} \ $RPM_BUILD_ROOT{%{_libdir},%{_includedir}/NVCtrl} cp -a samples/* $RPM_BUILD_ROOT%{_examplesdir}/libXNVCtrl-%{version} -install -p src/libXNVCtrl/NVCtrl.h $RPM_BUILD_ROOT%{_includedir}/NVCtrl -install -p src/libXNVCtrl/NVCtrlLib.h $RPM_BUILD_ROOT%{_includedir}/NVCtrl -install -p src/libXNVCtrl/libXNVCtrl.a $RPM_BUILD_ROOT%{_libdir} +cp -p src/libXNVCtrl/NVCtrl.h $RPM_BUILD_ROOT%{_includedir}/NVCtrl +cp -p src/libXNVCtrl/NVCtrlLib.h $RPM_BUILD_ROOT%{_includedir}/NVCtrl +cp -p src/libXNVCtrl/libXNVCtrl.a $RPM_BUILD_ROOT%{_libdir} +%endif + +%if %{with utils} +install -d $RPM_BUILD_ROOT%{_bindir} +for prog in samples/nv-control-*; do + case "$prog" in + *.*) + continue + ;; + esac + install -p $prog $RPM_BUILD_ROOT%{_bindir} +done +find $RPM_BUILD_ROOT%{_examplesdir}/libXNVCtrl-%{version} -type f -executable | xargs rm -v %endif %clean @@ -134,6 +152,15 @@ %{_pixmapsdir}/nvidia-settings.png %endif +%if %{with utils} +%attr(755,root,root) %{_bindir}/nv-control-dpy +%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-info +%attr(755,root,root) %{_bindir}/nv-control-targets +%endif + %if %{with libXNVCtrl} %files -n libXNVCtrl-devel %defattr(644,root,root,755) @@ -151,6 +178,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.21.2.4 2012/05/06 14:43:22 glen +- build nv-control utils from samples dir + Revision 1.21.2.3 2012/05/06 14:33:23 glen - restore xlibs patch for this branch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/nvidia-settings/nvidia-settings.spec?r1=1.21.2.3&r2=1.21.2.4 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
