X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=nvidia-settings.spec;h=d4f81b4439acad88b747507e15234927f483f873;hb=a827dcb0fd8d71c558ab2da4daa5ab6ed4e2eb25;hp=4e856ca39dd806d14eedb5009a63344b0408dd99;hpb=f73ec7ffe065614c25b3a229d77c02208428f95c;p=packages%2Fnvidia-settings.git

diff --git a/nvidia-settings.spec b/nvidia-settings.spec
index 4e856ca..d4f81b4 100644
--- a/nvidia-settings.spec
+++ b/nvidia-settings.spec
@@ -9,15 +9,16 @@ 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:	510.54
+Version:	525.60.11
 Release:	1
 License:	GPL v2 (with MIT parts)
 Group:		X11/Applications
 Source0:	https://download.nvidia.com/XFree86/nvidia-settings/%{name}-%{version}.tar.bz2
-# Source0-md5:	c5f2575d0b9f538a588e0f9ba4caea4b
+# Source0-md5:	952676b8735cf6af9eaf6dd827354c97
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source3:	%{name}-autostart.desktop
+Patch0:		wayland.patch
 URL:		ftp://download.nvidia.com/XFree86/nvidia-settings/
 BuildRequires:	OpenGL-devel
 BuildRequires:	libvdpau-devel >= 1.0
@@ -31,6 +32,7 @@ BuildRequires:	gtk+2-devel >= 2.0
 BuildRequires:	jansson-devel >= 2.2
 BuildRequires:	m4
 BuildRequires:	pkgconfig
+BuildRequires:	wayland-devel
 %endif
 Requires:	%{name}-guilib = %{version}-%{release}
 Requires:	libvdpau >= 1.0
@@ -105,7 +107,7 @@ Group:		Development/Libraries
 Requires:	xorg-lib-libX11-devel
 Requires:	xorg-lib-libXext-devel
 Requires:	xorg-lib-libXxf86vm-devel
-Obsoletes:	libXNVCtrl-static
+Obsoletes:	libXNVCtrl-static < 195.36.24
 
 %description -n libXNVCtrl-devel
 Library for accessing NV-CONTROL extension in NVIDIA's latest drivers.
@@ -116,6 +118,7 @@ sterowników NVIDIA.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %if %{with libXNVCtrl}
@@ -206,6 +209,9 @@ done
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
 %post	gtk2 -p /sbin/ldconfig
 %postun	gtk2 -p /sbin/ldconfig
 
@@ -226,6 +232,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/nv-control-targets
 %attr(755,root,root) %{_bindir}/nv-control-warpblend
 %endif
+%attr(755,root,root) %{_libdir}/libnvidia-wayland-client.so.*
 %{_mandir}/man1/nvidia-settings.1*
 %{_desktopdir}/nvidia-settings.desktop
 %{_pixmapsdir}/nvidia-settings.png