- removed OpenGL*-devel provides from -devel (headers no longer provided)

[packages/xorg-driver-video-nvidia.git] / xorg-driver-video-nvidia.spec

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 815c8047781f6a502b3be6c8db430ca855b3255f..59b3e9a1badc9964facf3a2a04273686cb7199a8 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -4,7 +4,7 @@
 # - kernel-drm is required on never kernels. driver for kernel-longterm not requires drm
 #
 # Conditional build:
-%bcond_with    system_libglvnd # do not use system libglvnd
+%bcond_with    system_libglvnd # use system libglvnd
 %bcond_without kernel          # without kernel packages
 %bcond_without userspace       # don't build userspace programs
 %bcond_with    settings        # package nvidia-settings here (GPL version of same packaged from nvidia-settings.spec)
@@ -21,7 +21,7 @@ exit 1
 
 %define                no_install_post_check_so 1
 
-%define                rel     1
+%define                rel     2
 %define                pname   xorg-driver-video-nvidia
 Summary:       Linux Drivers for nVidia GeForce/Quadro Chips
 Summary(hu.UTF-8):     Linux meghajtók nVidia GeForce/Quadro chipekhez
@@ -40,7 +40,8 @@ Source3:      gl.pc.in
 Source4:       10-nvidia.conf
 Source5:       10-nvidia-modules.conf
 Patch0:                X11-driver-nvidia-desktop.patch
-URL:           http://www.nvidia.com/object/unix.html
+URL:           https://www.nvidia.com/en-us/drivers/unix/
+BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.752
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.32}}
 BuildRequires: sed >= 4.0
@@ -54,8 +55,8 @@ Provides:     ocl-icd-driver
 Provides:      vulkan(icd) = 1.2.155
 Provides:      xorg-driver-video
 Provides:      xorg-xserver-module(glx)
-Obsoletes:     XFree86-driver-nvidia
-Obsoletes:     XFree86-nvidia
+Obsoletes:     XFree86-driver-nvidia < 1.0.5336-4
+Obsoletes:     XFree86-nvidia < 1.0
 Conflicts:     XFree86-OpenGL-devel <= 4.2.0-3
 ExclusiveArch: %{?with_userspace:%{ix86}} %{x8664}
 BuildRoot:     %{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
@@ -118,6 +119,9 @@ Obsoletes:  X11-OpenGL-core < 1:7.0.0
 Obsoletes:     X11-OpenGL-libGL < 1:7.0.0
 Obsoletes:     XFree86-OpenGL-core < 1:7.0.0
 Obsoletes:     XFree86-OpenGL-libGL < 1:7.0.0
+%if %{with system_libglvnd}
+Obsoletes:     xorg-driver-video-nvidia-devel < 465.27-2
+%endif
 
 %description libs
 NVIDIA OpenGL (GL and GLX only) implementation libraries.
@@ -131,11 +135,9 @@ Summary(hu.UTF-8): OpenGL (GL és GLX) fejléc fájlok
 Summary(pl.UTF-8):     Pliki nagłówkowe OpenGL (GL i GLX)
 Group:         X11/Development/Libraries
 Requires:      %{pname}-libs = %{epoch}:%{version}-%{rel}
-Provides:      OpenGL-GLX-devel = 1.4
-Provides:      OpenGL-devel = 2.1
-Obsoletes:     X11-OpenGL-devel-base
-Obsoletes:     XFree86-OpenGL-devel-base
-Obsoletes:     XFree86-driver-nvidia-devel
+Obsoletes:     X11-OpenGL-devel-base < 1:7.0.0
+Obsoletes:     XFree86-OpenGL-devel-base < 1:7.0.0
+Obsoletes:     XFree86-driver-nvidia-devel < 1.0.5336-4
 Conflicts:     XFree86-OpenGL-devel < 4.3.99.902-0.3
 
 %description devel
@@ -151,6 +153,7 @@ firmy NVIDIA.
 
 %package doc
 Summary:       Documentation for NVIDIA Graphics Driver
+Summary(pl.UTF-8):     Dokumentacja do sterownika graficznego NVIDIA
 Group:         Documentation
 BuildArch:     noarch
 
@@ -158,6 +161,10 @@ BuildArch: noarch
 NVIDIA Accelerated Linux Graphics Driver README and Installation
 Guide.
 
+%description doc -l pl.UTF-8
+Plik README oraz przewodnik instalacji do akcelerowanego sterownika
+graficznego NVIDIA dla Linuksa.
+
 %package progs
 Summary:       Tools for advanced control of nVidia graphic cards
 Summary(hu.UTF-8):     Eszközök az nVidia grafikus kártyák beállításához
@@ -165,7 +172,7 @@ Summary(pl.UTF-8):  Narzędzia do zarządzania kartami graficznymi nVidia
 Group:         Applications/System
 Requires:      %{pname} = %{epoch}:%{version}
 Suggests:      pkgconfig
-Obsoletes:     XFree86-driver-nvidia-progs
+Obsoletes:     XFree86-driver-nvidia-progs < 1.0.5336-4
 
 %description progs
 Tools for advanced control of nVidia graphic cards.
@@ -193,7 +200,7 @@ Requires:   %{releq_kernel -n drm}\
 Requires(postun):      %releq_kernel\
 Requires:      %{pname} = %{epoch}:%{version}\
 Provides:      X11-driver-nvidia(kernel)\
-Obsoletes:     XFree86-nvidia-kernel\
+Obsoletes:     XFree86-nvidia-kernel < 1.0.5336-4\
 \
 %description -n kernel%{_alt_kernel}-video-nvidia\
 nVidia Architecture support for Linux kernel.\
@@ -439,6 +446,7 @@ EOF
 %if %{without system_libglvnd}
 %attr(755,root,root) %{_libdir}/nvidia/libGL.so.1.7.0
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libGL.so.1
+%attr(755,root,root) %{_libdir}/nvidia/libGL.so
 %attr(755,root,root) %{_libdir}/nvidia/libGLX.so.0
 %attr(755,root,root) %{_libdir}/nvidia/libOpenGL.so.0
 %attr(755,root,root) %{_libdir}/nvidia/libGLdispatch.so.0
@@ -507,17 +515,16 @@ EOF
 %{_datadir}/vulkan/icd.d/nvidia_icd.json
 %endif
 
+%if %{without system_libglvnd}
 %files devel
 %defattr(644,root,root,755)
-%if %{without system_libglvnd}
-%attr(755,root,root) %{_libdir}/nvidia/libGL.so
 %attr(755,root,root) %{_libdir}/nvidia/libGLX.so
 %attr(755,root,root) %{_libdir}/nvidia/libOpenGL.so
 %attr(755,root,root) %{_libdir}/nvidia/libGLESv1_CM.so
 %attr(755,root,root) %{_libdir}/nvidia/libGLESv2.so
 %attr(755,root,root) %{_libdir}/nvidia/libEGL.so
-%endif
 %{_pkgconfigdir}/gl.pc
+%endif
 
 %files doc
 %defattr(644,root,root,755)
@@ -535,7 +542,7 @@ EOF
 %{_mandir}/man1/nvidia-smi.1*
 %{_mandir}/man1/nvidia-xconfig.1*
 %if %{with settings}
-%attr(755,root,root) /etc/X11/xinit/xinitrc.d/*.sh
+%attr(755,root,root) /etc/X11/xinit/xinitrc.d/nvidia-settings.sh
 %attr(755,root,root) %{_bindir}/nvidia-settings
 %{_mandir}/man1/nvidia-settings.1*
 %{_desktopdir}/nvidia-settings.desktop