Author: glen Date: Wed Feb 13 17:11:21 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- cleanup macros, modules depend on kernel vermagic
---- Files affected:
SPECS:
X11-driver-nvidia.spec (1.78.2.9.2.34 -> 1.78.2.9.2.35)
---- Diffs:
================================================================
Index: SPECS/X11-driver-nvidia.spec
diff -u SPECS/X11-driver-nvidia.spec:1.78.2.9.2.34
SPECS/X11-driver-nvidia.spec:1.78.2.9.2.35
--- SPECS/X11-driver-nvidia.spec:1.78.2.9.2.34 Wed Feb 13 10:36:05 2008
+++ SPECS/X11-driver-nvidia.spec Wed Feb 13 18:11:16 2008
@@ -7,15 +7,10 @@
%bcond_without kernel # without kernel packages
%bcond_without userspace # don't build userspace programs
%bcond_with verbose # verbose build (V=1)
-%bcond_with grsec_kernel # build for kernel-grsecurity
-%bcond_with kabi # new kernel deps, see [EMAIL PROTECTED]
%if %{without kernel}
%undefine with_dist_kernel
%endif
-%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
-%define alt_kernel grsecurity
-%endif
%if "%{_alt_kernel}" != "%{nil}"
%undefine with_userspace
%endif
@@ -28,42 +23,32 @@
%define smp_kernel 0
%endif
-%if %{with kabi}
-%define modrel %{_rel}
-%else
-%define modrel [EMAIL PROTECTED]
-%endif
-
-%define _nv_ver 100.14.19
-%define _min_x11 6.7.0
-%define _rel 62
-
%define pname X11-driver-nvidia
Summary: Linux Drivers for NVIDIA GeForce/Quadro Chips
Summary(pl): Sterowniki do kart graficznych NVIDIA GeForce/Quadro
Name: %{pname}%{_alt_kernel}
-Version: %{_nv_ver}
-Release: %{_rel}
+Version: 100.14.19
+Release: 62
License: nVidia Binary
Group: X11
-Source0:
http://us.download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}/NVIDIA-Linux-x86-%{_nv_ver}-pkg1.run
+Source0:
http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg1.run
# Source0-md5: d2f89f60cef8f9a0cc0ce228b46eeb8b
-Source1:
http://us.download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}/NVIDIA-Linux-x86_64-%{_nv_ver}-pkg1.run
+Source1:
http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg1.run
# Source1-md5: 3d702d7d67875b4b1e3095c2eb448b29
Source2: %{pname}-settings.desktop
Source3: %{pname}-xinitrc.sh
Patch0: %{pname}-GL.patch
URL: http://www.nvidia.com/object/unix.html
%if %{with kernel}
-%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >=
3:2.6.7}
BuildRequires: %{kgcc_package}
+%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >=
3:2.6.7}
BuildRequires: rpmbuild(macros) >= 1.330
%endif
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
@@ -144,8 +129,6 @@
Summary: nVidia kernel module for nVidia Architecture support
Summary(de): Das nVidia-Kern-Modul f�r die nVidia-Architektur-Unterst�tzung
Summary(pl): Modu� j�dra dla obs�ugi kart graficznych nVidia
-Version: %{_nv_ver}
-Release: %{modrel}
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
Requires: dev >= 2.7.7-10
@@ -153,7 +136,7 @@
%{?with_dist_kernel:%{!?with_kabi:%requires_releq_kernel}}
%{?with_dist_kernel:%{?with_kabi:Requires: kernel%{_alt_kernel}(vermagic)
= %{_kernel_ver}}}
%else
-%{?with_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:Requires: kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
%endif
Provides: X11-driver-nvidia(kernel)
Obsoletes: XFree86-nvidia-kernel
@@ -172,11 +155,10 @@
Summary: nVidia kernel module for nVidia Architecture support
Summary(de): Das nVidia-Kern-Modul f�r die nVidia-Architektur-Unterst�tzung
Summary(pl): Modu� j�dra dla obs�ugi kart graficznych nVidia
-Release: %{modrel}
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
Requires: dev >= 2.7.7-10
-%{?with_dist_kernel:%requires_releq_kernel_smp}
+%{?with_dist_kernel:Requires: kernel%{_alt_kernel}-smp(vermagic) =
%{_kernel_ver}}
Provides: X11-driver-nvidia(kernel)
Obsoletes: XFree86-nvidia-kernel
@@ -192,13 +174,13 @@
%prep
cd %{_builddir}
-rm -rf NVIDIA-Linux-x86*-%{_nv_ver}-pkg*
+rm -rf NVIDIA-Linux-x86*-%{version}-pkg*
%ifarch %{ix86}
/bin/sh %{SOURCE0} --extract-only
-%setup -qDT -n NVIDIA-Linux-x86-%{_nv_ver}-pkg1
+%setup -qDT -n NVIDIA-Linux-x86-%{version}-pkg1
%else
/bin/sh %{SOURCE1} --extract-only
-%setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}-pkg1
+%setup -qDT -n NVIDIA-Linux-x86_64-%{version}-pkg1
%endif
%patch0 -p1
sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
@@ -346,6 +328,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.78.2.9.2.35 2008-02-13 17:11:16 glen
+- cleanup macros, modules depend on kernel vermagic
+
Revision 1.78.2.9.2.34 2008-02-13 09:36:05 glen
- fix up module build; rel 62
@@ -761,7 +746,7 @@
Revision 1.51 2004/04/08 10:51:52 pluto
- merged with kernel-video-nvidia.
-- %%build complaint with 2.6.x.
+- %build complaint with 2.6.x.
Revision 1.50 2004/04/03 22:33:26 gotar
- s/glibc-tls/glibc(tls)/
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/X11-driver-nvidia.spec?r1=1.78.2.9.2.34&r2=1.78.2.9.2.35&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
