Author: mguevara Date: Mon Mar 26 15:11:34 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- updated for new kernel macros - up/smp removed
---- Files affected:
SPECS:
X11-driver-nvidia.spec (1.99 -> 1.100) , X11-driver-firegl.spec (1.148 ->
1.149)
---- Diffs:
================================================================
Index: SPECS/X11-driver-nvidia.spec
diff -u SPECS/X11-driver-nvidia.spec:1.99 SPECS/X11-driver-nvidia.spec:1.100
--- SPECS/X11-driver-nvidia.spec:1.99 Tue Mar 13 17:45:19 2007
+++ SPECS/X11-driver-nvidia.spec Mon Mar 26 17:11:28 2007
@@ -4,8 +4,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 incall # include all tarballs
%bcond_without userspace # don't build userspace programs
@@ -153,7 +151,7 @@
Group: Base/Kernel
Requires(post,postun): /sbin/depmod
Requires: dev >= 2.7.7-10
-%{?with_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:%requires_releq_kernel}
Provides: X11-driver-nvidia(kernel)
Obsoletes: XFree86-nvidia-kernel
@@ -167,28 +165,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
-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: [EMAIL PROTECTED]
-Group: Base/Kernel
-Requires(post,postun): /sbin/depmod
-Requires: dev >= 2.7.7-10
-%{?with_dist_kernel:%requires_releq_kernel_smp}
-Provides: X11-driver-nvidia(kernel)
-Obsoletes: XFree86-nvidia-kernel
-
-%description -n kernel%{_alt_kernel}-smp-video-nvidia
-nVidia Architecture support for Linux kernel SMP.
-
-%description -n kernel%{_alt_kernel}-smp-video-nvidia -l de.UTF-8
-Die nVidia-Architektur-Unterstützung für den Linux-Kern SMP.
-
-%description -n kernel%{_alt_kernel}-smp-video-nvidia -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*-%{_nv_ver}-%{_nv_rel}-pkg*
@@ -276,7 +252,7 @@
* *
* NOTE: *
* You must install: *
- * kernel(24)(-smp)-video-nvidia-%{version} *
+ * kernel-video-nvidia-%{version} *
* for this driver to work *
* *
*******************************************************
@@ -291,12 +267,6 @@
%postun -n kernel%{_alt_kernel}-video-nvidia
%depmod %{_kernel_ver}
-%post -n kernel%{_alt_kernel}-smp-video-nvidia
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-video-nvidia
-%depmod %{_kernel_ver}smp
-
%if %{with userspace}
%files
%defattr(644,root,root,755)
@@ -329,12 +299,6 @@
%files -n kernel%{_alt_kernel}-video-nvidia
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/misc/*.ko*
-
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-video-nvidia
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/*.ko*
-%endif
%endif
%if %{with userspace}
@@ -362,6 +326,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.100 2007/03/26 15:11:28 mguevara
+- updated for new kernel macros - up/smp removed
+
Revision 1.99 2007/03/13 16:45:19 glen
- up bcond
================================================================
Index: SPECS/X11-driver-firegl.spec
diff -u SPECS/X11-driver-firegl.spec:1.148 SPECS/X11-driver-firegl.spec:1.149
--- SPECS/X11-driver-firegl.spec:1.148 Wed Mar 14 01:13:57 2007
+++ SPECS/X11-driver-firegl.spec Mon Mar 26 17:11:28 2007
@@ -3,8 +3,6 @@
# Conditional build:
%bcond_without dist_kernel # without distribution kernel
%bcond_without kernel # don't build kernel modules
-%bcond_without up # don't build UP module
-%bcond_without smp # don't build SMP module
%bcond_without userspace # don't build userspace tools
%bcond_with verbose # verbose build (V=1)
%bcond_without incall # include all sources in srpm
@@ -92,7 +90,7 @@
Release: [EMAIL PROTECTED]
License: ATI
Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:%requires_releq_kernel}
Requires(post,postun): /sbin/depmod
Provides: X11-driver-firegl(kernel)
@@ -102,22 +100,6 @@
%description -n kernel%{_alt_kernel}-video-firegl -l pl.UTF-8
Moduł jądra oferujący wsparcie dla ATI FireGL.
-%package -n kernel%{_alt_kernel}-smp-video-firegl
-Summary: ATI kernel module for FireGL support
-Summary(pl.UTF-8): Moduł jądra oferujący wsparcie dla ATI FireGL
-Release: [EMAIL PROTECTED]
-License: ATI
-Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
-Requires(post,postun): /sbin/depmod
-Provides: X11-driver-firegl(kernel)
-
-%description -n kernel%{_alt_kernel}-smp-video-firegl
-ATI kernel module for FireGL support.
-
-%description -n kernel%{_alt_kernel}-smp-video-firegl -l pl.UTF-8
-Moduł jądra oferujący wsparcie dla ATI FireGL.
-
%prep
%setup -q -c -T
@@ -199,12 +181,6 @@
%postun -n kernel%{_alt_kernel}-video-firegl
%depmod %{_kernel_ver}
-%post -n kernel%{_alt_kernel}-smp-video-firegl
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-video-firegl
-%depmod %{_kernel_ver}smp
-
%if %{with userspace}
%files
%defattr(644,root,root,755)
@@ -236,25 +212,20 @@
%endif
%if %{with kernel}
-%if %{with up} || %{without dist_kernel}
%files -n kernel%{_alt_kernel}-video-firegl
%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-firegl
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/*.ko*
-%endif
-%endif
-
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[EMAIL PROTECTED]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.149 2007/03/26 15:11:28 mguevara
+- updated for new kernel macros - up/smp removed
+
Revision 1.148 2007/03/14 00:13:57 glen
- up bcond
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/X11-driver-nvidia.spec?r1=1.99&r2=1.100&f=u
http://cvs.pld-linux.org/SPECS/X11-driver-firegl.spec?r1=1.148&r2=1.149&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
