up to 525.60.11

[packages/nvidia-settings.git] / nvidia-settings.spec

diff --git a/nvidia-settings.spec b/nvidia-settings.spec
index 1da5afccfe2d338fe32af126b400bd3939fe00bc..d4f81b4439acad88b747507e15234927f483f873 100644 (file)
--- 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:       415.25
+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: b9dca558df9f69eaf879466311a1e2bc
+# 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,32 +118,34 @@ sterowników NVIDIA.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %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
@@ -205,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
 
@@ -221,11 +228,11 @@ 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
 %endif
+%attr(755,root,root) %{_libdir}/libnvidia-wayland-client.so.*
 %{_mandir}/man1/nvidia-settings.1*
 %{_desktopdir}/nvidia-settings.desktop
 %{_pixmapsdir}/nvidia-settings.png