%bcond_without userspace # don't build userspace programs
%bcond_with verbose # verbose build (V=1)
#
+%define no_install_post_strip 1
+#
%define _nv_ver 1.0
-%define _nv_rel 8178
+%define _nv_rel 8762
%define _min_x11 6.7.0
%define _rel 0.1
#
Version: %{_nv_ver}.%{_nv_rel}
Release: %{_rel}
License: nVidia Binary
-Vendor: nVidia Corp.
Group: X11
# why not pkg0!?
%if %{need_x86}
Source0: http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run
-# Source0-md5: bc9d459bfeee93735e3959de041635df
+# Source0-md5: 86bcf4a3a9d441dff9e25b82ec8a6060
%endif
%if %{need_x8664}
Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg1.run
-# Source1-md5: 0da016f8d5138c1ee51b7fa375821574
+# Source1-md5: 73a12a4933c57941a7a8b7c1186f8b93
%endif
-Patch0: X11-driver-nvidia-gcc34.patch
+#Patch0: X11-driver-nvidia-gcc34.patch
Patch1: X11-driver-nvidia-GL.patch
+Patch2: X11-driver-nvidia-desktop.patch
# http://www.minion.de/files/1.0-6629/
URL: http://www.nvidia.com/object/linux.html
-BuildRequires: grep
%if %{with kernel}
-%{?with_dist_kernel:BuildRequires: kernel-module-build >= 2.6.7}
+%{?with_dist_kernel:BuildRequires: kernel-module-build >= 3:2.6.7}
%endif
BuildRequires: %{kgcc_package}
BuildRequires: rpmbuild(macros) >= 1.213
BuildRequires: sed >= 4.0
-BuildRequires: textutils
-#BuildRequires: X11-devel >= %{_min_x11} # disabled for now
BuildConflicts: XFree86-nvidia
-Requires: X11-Xserver
-Requires: X11-libs >= %{_min_x11}
-Requires: X11-modules >= %{_min_x11}
+Requires: xorg-xserver-server
+Provides: OpenGL = 1.5
+Provides: OpenGL-GLX
Provides: X11-OpenGL-core
Provides: X11-OpenGL-libGL
Provides: XFree86-OpenGL-core
Provides: XFree86-OpenGL-libGL
+Provides: xorg-xserver-modules-libglx
Obsoletes: Mesa
Obsoletes: X11-OpenGL-core
Obsoletes: X11-OpenGL-libGL
Summary(pl): Pliki nag³ówkowe OpenGL dla systemu X11R6 (tylko gl?.h)
Group: X11/Development/Libraries
Requires: %{name} = %{version}-%{release}
+Provides: OpenGL-GLX-devel
+Provides: OpenGL-devel = 1.5
Provides: OpenGL-devel-base
Obsoletes: OpenGL-devel-base
Obsoletes: XFree86-driver-nvidia-devel
/bin/sh %{SOURCE1} --extract-only
%setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg1
%endif
-%patch0 -p1
+#%patch0 -p1
%patch1 -p1
+%patch2 -p1
echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/src/nv/Makefile.kbuild
%build
%if %{with userspace}
install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \
- $RPM_BUILD_ROOT{%{_includedir}/GL,%{_libdir},%{_bindir}}
+ $RPM_BUILD_ROOT{%{_includedir}/GL,%{_libdir},%{_bindir},%{_mandir}/man1} \
+ $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
-install usr/bin/nvidia-settings $RPM_BUILD_ROOT%{_bindir}
+install usr/bin/nvidia-{settings,xconfig} $RPM_BUILD_ROOT%{_bindir}
+install usr/share/man/man1/nvidia-{settings,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1
+install usr/share/applications/nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir}
+install usr/share/doc/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
for f in \
usr/lib/tls/libnvidia-tls.so.%{version} \
%files
%defattr(644,root,root,755)
%doc LICENSE
-%doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample}
+%doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample,html}
# OpenGL ABI for Linux compatibility
%attr(755,root,root) %{_libdir}/libGL.so
%attr(755,root,root) %{_libdir}/libGL.so.1
%files progs
%defattr(644,root,root,755)
-%doc usr/share/doc/nvidia-settings-user-guide.txt
%attr(755,root,root) %{_bindir}/nvidia-settings
+%attr(755,root,root) %{_bindir}/nvidia-xconfig
+%{_desktopdir}/nvidia-settings.desktop
+%{_mandir}/man1/nvidia-*
+%{_pixmapsdir}/nvidia-settings.png
%endif