SPECS: xorg-driver-video-nvidia.spec - update rpmbuild(macros) and...

[rotom]

Author: rotom                        Date: Thu Mar 22 23:52:55 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- update rpmbuild(macros) and macros
- remove whole smp stuff

---- Files affected:
SPECS:
   xorg-driver-video-nvidia.spec (1.96 -> 1.97) 

---- Diffs:

================================================================
Index: SPECS/xorg-driver-video-nvidia.spec
diff -u SPECS/xorg-driver-video-nvidia.spec:1.96 SPECS/xorg-driver-video-nvidia.spec:1.97
--- SPECS/xorg-driver-video-nvidia.spec:1.96	Mon Feb 19 15:13:21 2007
+++ SPECS/xorg-driver-video-nvidia.spec	Fri Mar 23 00:52:50 2007
@@ -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	incall		# include all tarballs
 %bcond_without	userspace	# don't build userspace programs
@@ -53,7 +51,7 @@
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
 %endif
 BuildRequires:	%{kgcc_package}
-BuildRequires:	rpmbuild(macros) >= 1.330
+BuildRequires:	rpmbuild(macros) >= 1.379
 BuildRequires:	sed >= 4.0
 BuildConflicts:	XFree86-nvidia
 Requires:	xorg-xserver-server
@@ -135,7 +133,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
 
@@ -149,28 +147,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:	%{_rel}@%{_kernel_ver_str}
-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*
@@ -256,7 +232,7 @@
  *                                                     *
  *  NOTE:                                              *
  *  You must install:                                  *
- *  kernel(24)(-smp)-video-nvidia-%{version}             *
+ *  kernel(24)-video-nvidia-%{version}             *
  *  for this driver to work                            *
  *                                                     *
  *******************************************************
@@ -271,12 +247,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)
@@ -299,19 +269,11 @@
 %endif
 
 %if %{with kernel}
-%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-video-nvidia
 %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
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/*.ko*
-%endif
-%endif
-
 %if %{with userspace}
 %files devel
 %defattr(644,root,root,755)
@@ -337,6 +299,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.97  2007/03/22 23:52:50  rotom
+- update rpmbuild(macros) and macros
+- remove whole smp stuff
+
 Revision 1.96  2007/02/19 14:13:21  baggins
 - fix libglx provides
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xorg-driver-video-nvidia.spec?r1=1.96&r2=1.97&f=u