SPECS (AC-branch): X11-driver-nvidia-legacy2.spec - update to 96.43.05 for ...
glen
glen at pld-linux.org
Thu Jul 3 08:39:41 CEST 2008
Author: glen Date: Thu Jul 3 06:39:40 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- update to 96.43.05 for 2.6.22 kernels, old one in LINUX_2_6_16 branch
---- Files affected:
SPECS:
X11-driver-nvidia-legacy2.spec (1.1.2.31 -> 1.1.2.32)
---- Diffs:
================================================================
Index: SPECS/X11-driver-nvidia-legacy2.spec
diff -u SPECS/X11-driver-nvidia-legacy2.spec:1.1.2.31 SPECS/X11-driver-nvidia-legacy2.spec:1.1.2.32
--- SPECS/X11-driver-nvidia-legacy2.spec:1.1.2.31 Thu Jul 3 08:32:19 2008
+++ SPECS/X11-driver-nvidia-legacy2.spec Thu Jul 3 08:39:35 2008
@@ -2,8 +2,6 @@
#
# Conditional build:
%bcond_without dist_kernel # without distribution kernel
-%bcond_without up # without up packages
-%bcond_without smp # without smp packages
%bcond_without kernel # without kernel packages
%bcond_without userspace # don't build userspace programs
%bcond_with verbose # verbose build (V=1)
@@ -14,22 +12,24 @@
%if "%{_alt_kernel}" != "%{nil}"
%undefine with_userspace
%endif
-
-%define _min_x11 6.7.0
-#
+%if %{without userspace}
+# nothing to be placed to debuginfo package
+%define _enable_debug_packages 0
+%endif
%define pname X11-driver-nvidia-legacy2
+%define rel 1
Summary: Linux Drivers for NVIDIA GeForce/Quadro Chips
Summary(pl.UTF-8): Sterowniki do kart graficznych NVIDIA GeForce/Quadro
Name: %{pname}%{_alt_kernel}
-Version: 96.43.01
-Release: 63
+Version: 96.43.05
+Release: %{rel}
License: nVidia Binary
Group: X11
Source0: http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg1.run
-# Source0-md5: 66f8b5e243aad22162e40d0f05f0bf1e
+# Source0-md5: addf2d2187e94885f1d5e7b6907202ff
Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg1.run
-# Source1-md5: 1cb134675bbdce8e172a0edc78618ed3
+# Source1-md5: 81a504bfddf36c6e93612635ed03f28f
Source2: %{pname}-settings.desktop
Source3: %{pname}-xinitrc.sh
Patch0: %{pname}-GL.patch
@@ -42,8 +42,8 @@
BuildRequires: sed >= 4.0
BuildConflicts: XFree86-nvidia
Requires: X11-Xserver
-Requires: X11-libs >= %{_min_x11}
-Requires: X11-modules >= %{_min_x11}
+Requires: X11-libs >= 6.7.0
+Requires: X11-modules >= 6.7.0
Provides: X11-OpenGL-core
Provides: X11-OpenGL-libGL
Provides: XFree86-OpenGL-core
@@ -124,12 +124,13 @@
Summary: nVidia kernel module for nVidia Architecture support
Summary(de.UTF-8): Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
Summary(pl.UTF-8): Moduł jądra dla obsługi kart graficznych nVidia
+Release: %{rel}@%{_kernel_vermagic}
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
Requires: dev >= 2.7.7-10
%{?with_dist_kernel:Requires: kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
-Provides: X11-driver-nvidia-legacy2(kernel)
Obsoletes: XFree86-nvidia-kernel
+Obsoletes: kernel%{_alt_kernel}-smp-video-nvidia-legacy2
%description -n kernel%{_alt_kernel}-video-nvidia-legacy2
nVidia Architecture support for Linux kernel.
@@ -141,27 +142,6 @@
Obsługa architektury nVidia dla jądra Linuksa. Pakiet wymagany przez
sterownik nVidii dla Xorg/XFree86.
-%package -n kernel%{_alt_kernel}-smp-video-nvidia-legacy2
-Summary: nVidia kernel module for nVidia Architecture support
-Summary(de.UTF-8): Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
-Summary(pl.UTF-8): Moduł jądra dla obsługi kart graficznych nVidia
-Group: Base/Kernel
-Requires(post,postun): /sbin/depmod
-Requires: dev >= 2.7.7-10
-%{?with_dist_kernel:Requires: kernel%{_alt_kernel}-smp(vermagic) = %{_kernel_ver}}
-Provides: X11-driver-nvidia-legacy2(kernel)
-Obsoletes: XFree86-nvidia-kernel
-
-%description -n kernel%{_alt_kernel}-smp-video-nvidia-legacy2
-nVidia Architecture support for Linux kernel SMP.
-
-%description -n kernel%{_alt_kernel}-smp-video-nvidia-legacy2 -l de.UTF-8
-Die nVidia-Architektur-Unterstützung für den Linux-Kern SMP.
-
-%description -n kernel%{_alt_kernel}-smp-video-nvidia-legacy2 -l pl.UTF-8
-Obsługa architektury nVidia dla jądra Linuksa SMP. Pakiet wymagany
-przez sterownik nVidii dla Xorg/XFree86.
-
%prep
cd %{_builddir}
rm -rf NVIDIA-Linux-x86*-%{version}-pkg*
@@ -239,7 +219,7 @@
* *
* NOTE: *
* You must install: *
- * kernel(24)(-smp)-video-nvidia-legacy2-%{version} *
+ * kernel-video-nvidia-legacy2-%{version} *
* for this driver to work *
* *
*******************************************************
@@ -254,12 +234,6 @@
%postun -n kernel%{_alt_kernel}-video-nvidia-legacy2
%depmod %{_kernel_ver}
-%post -n kernel%{_alt_kernel}-smp-video-nvidia-legacy2
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-video-nvidia-legacy2
-%depmod %{_kernel_ver}smp
-
%if %{with userspace}
%files
%defattr(644,root,root,755)
@@ -279,19 +253,11 @@
%endif
%if %{with kernel}
-%if %{with up} || %{without dist_kernel}
%files -n kernel%{_alt_kernel}-video-nvidia-legacy2
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/misc/*.ko*
%endif
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-video-nvidia-legacy2
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/*.ko*
-%endif
-%endif
-
%if %{with userspace}
%files devel
%defattr(644,root,root,755)
@@ -316,98 +282,8 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.1.2.31 2008/07/03 06:32:19 glen
-- convert to utf8
-
-Revision 1.1.2.30 2008-02-19 23:26:32 glen
-- release 63
-
-Revision 1.1.2.29 2008-02-15 01:29:33 glen
-- use kernel vermagic in deps
-
-Revision 1.1.2.28 2008-02-12 11:01:11 glen
-- release 61 (kernel-2.6.16.60-4)
-
-Revision 1.1.2.27 2008-01-28 09:33:20 glen
-- rel 60 (kernel-2.6.16.60-1)
-
-Revision 1.1.2.26 2008-01-18 12:27:50 glen
-- rel 59 (2.6.16.58-1)
-
-Revision 1.1.2.25 2007-11-06 18:28:42 glen
-- rel 58 (2.6.16.57-1)
-
-Revision 1.1.2.24 2007/11/04 20:22:05 glen
-- prefix src package with alt kernel if present
-
-Revision 1.1.2.23 2007/11/01 08:27:24 adamg
-- release 57 (rebuild against 2.6.16.56-1)
-
-Revision 1.1.2.22 2007/10/22 20:41:53 glen
-- disable userspace for alt kernel
-
-Revision 1.1.2.21 2007/10/22 20:24:59 glen
-- unify kernel macros
-
-Revision 1.1.2.20 2007/10/22 19:48:29 glen
-- allow build without up kernel
-
-Revision 1.1.2.19 2007/10/22 09:06:03 hawk
-- rel 56
-
-Revision 1.1.2.18 2007/10/20 12:18:00 hawk
-- package xconfig and man files
-
-Revision 1.1.2.17 2007/10/20 12:07:19 hawk
-- use new kernel module build macros
-
-Revision 1.1.2.16 2007/10/20 11:59:09 hawk
-- src.rpm contents shouldn't be arch or bcond dependent
-- updated URL, removed obsolete conftest.patch, cleanup
-
-Revision 1.1.2.15 2007/10/18 12:35:21 hawk
-- updated to 96.43.01
-
-Revision 1.1.2.14 2007/10/15 08:26:44 glen
-- rel 55 (kernel 2.6.16.55)
-
-Revision 1.1.2.13 2007/10/15 08:21:38 glen
-- rel drbd.spec (2.6.16.55)
-
-Revision 1.1.2.12 2007/10/01 21:25:45 glen
-- rel 54
-
-Revision 1.1.2.11 2007/09/30 22:17:50 adamg
-- release 53.1 (rebuild against 2.6.16.53-2)
-
-Revision 1.1.2.10 2007/09/05 19:30:12 glen
-- rel 53 (kernel 2.6.16.53)
-
-Revision 1.1.2.9 2007/06/16 19:36:12 hawk
-- updated to 1.0.9639
-
-Revision 1.1.2.8 2007/06/04 08:09:08 glen
-- rel 52 (2.6.16.52)
-
-Revision 1.1.2.7 2007/05/11 06:38:50 glen
-- rel 51 (2.6.16.51)
-
-Revision 1.1.2.6 2007/05/08 12:10:09 glen
-- rel 50 (kernel 2.6.16.50)
-
-Revision 1.1.2.5 2007/04/25 22:13:24 glen
-- rel 4 (kernel 2.6.16.49)
-
-Revision 1.1.2.4 2007/04/08 23:58:55 shadzik
-- rel 3
-- STBR
-
-Revision 1.1.2.3 2007/04/08 23:58:18 shadzik
-- O: Mesa-libGL
-
-Revision 1.1.2.2 2007/04/08 23:44:14 hawk
-- fixed kernel packages names, release 2
+Revision 1.1.2.32 2008/07/03 06:39:35 glen
+- update to 96.43.05 for 2.6.22 kernels, old one in LINUX_2_6_16 branch
Revision 1.1.2.1 2007/03/28 14:48:32 hawk
- revived nvidia 96xx drivers as legacy2 for Ac
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/X11-driver-nvidia-legacy2.spec?r1=1.1.2.31&r2=1.1.2.32&f=u
More information about the pld-cvs-commit
mailing list