Author: glen Date: Sun Mar 13 20:08:57 2011 GMT Module: packages Tag: HEAD ---- Log message: - up to 270.30
---- Files affected: packages/nvidia-settings: nvidia-settings.spec (1.20 -> 1.21) , nvidia-settings-xlibs.patch (1.4 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/nvidia-settings/nvidia-settings.spec diff -u packages/nvidia-settings/nvidia-settings.spec:1.20 packages/nvidia-settings/nvidia-settings.spec:1.21 --- packages/nvidia-settings/nvidia-settings.spec:1.20 Sun Mar 13 20:15:07 2011 +++ packages/nvidia-settings/nvidia-settings.spec Sun Mar 13 21:08:52 2011 @@ -7,13 +7,12 @@ Summary: Tool for configuring the NVIDIA driver Summary(pl.UTF-8): Narzędzie do konfigurowania sterownika NVIDIA Name: nvidia-settings -Version: 195.36.31 -Release: 2 +Version: 270.30 +Release: 1 License: GPL Group: X11 -Source0: ftp://download.nvidia.com/XFree86/nvidia-settings/%{name}-%{version}.tar.gz -# Source0-md5: 30782edbe54e99f678cb73e08cd67470 -Patch0: %{name}-xlibs.patch +Source0: ftp://download.nvidia.com/XFree86/nvidia-settings/%{name}-%{version}.tar.bz2 +# Source0-md5: 8137b32cae22cd14f1fca5fe6d945db7 Source1: %{name}.desktop Source2: %{name}.png URL: ftp://download.nvidia.com/XFree86/nvidia-settings/ @@ -78,32 +77,34 @@ sterowników NVIDIA. %prep -%setup -q -n %{name}-1.0 -%patch0 -p1 +%setup -q + +%{__rm} src/libXNVCtrl/libXNVCtrl.a %build %if %{with libXNVCtrl} -cd src/libXNVCtrl -%{__make} clean -%{__make} \ +%{__make} -C src/libXNVCtrl \ + NV_VERBOSE=1 \ CC="%{__cc}" \ - CFLAGS="%{rpmcppflags} %{rpmcflags} -fPIC" -cd ../.. + X_CFLAGS="%{rpmcppflags} %{rpmcflags} -fPIC" %endif %if %{with nvidia_settings} %{__make} \ + NV_VERBOSE=1 \ + STRIP_CMD=: \ CC="%{__cc}" \ - CFLAGS="%{rpmcppflags} %{rpmcflags}" \ - LDFLAGS="%{rpmldflags}" + X_CFLAGS="%{rpmcppflags} %{rpmcflags}" \ + X_LDFLAGS="%{rpmldflags}" %endif %install rm -rf $RPM_BUILD_ROOT %if %{with nvidia_settings} install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_desktopdir},%{_pixmapsdir}} -install -p nvidia-settings $RPM_BUILD_ROOT%{_bindir} -cp -p doc/nvidia-settings.1 $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings.1 +%{__make} install \ + INSTALL="install -p" \ + prefix=$RPM_BUILD_ROOT%{_prefix} cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir} %endif @@ -146,6 +147,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.21 2011/03/13 20:08:52 glen +- up to 270.30 + Revision 1.20 2011/03/13 19:15:07 glen - add .desktop file from xorg-driver-video-nvidia package ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nvidia-settings/nvidia-settings.spec?r1=1.20&r2=1.21&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
