SPECS: kernel-misc-nforce.spec - alt-kernel modules must not confl...

[sparky]

Author: sparky                       Date: Mon Aug  7 10:41:57 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- alt-kernel modules must not conflict with normal ones

---- Files affected:
SPECS:
   kernel-misc-nforce.spec (1.26 -> 1.27) 

---- Diffs:

================================================================
Index: SPECS/kernel-misc-nforce.spec
diff -u SPECS/kernel-misc-nforce.spec:1.26 SPECS/kernel-misc-nforce.spec:1.27
--- SPECS/kernel-misc-nforce.spec:1.26	Mon Aug  7 12:22:16 2006
+++ SPECS/kernel-misc-nforce.spec	Mon Aug  7 12:41:52 2006
@@ -31,8 +31,10 @@
 %{!?without_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun):	/sbin/depmod
 Provides:	kernel%{_alt_kernel}-misc(nforce) = %{epoch}:%{version}-%{_rel}
+%if "%{_alt_kernel}" == "%{nil}"
 Obsoletes:	kernel-net-nforce
 Obsoletes:	kernel-sound-nforce
+%endif
 Obsoletes:	nforce-doc
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -64,8 +66,10 @@
 %{!?without_dist_kernel:%requires_releq_kernel_smp}
 Requires(post,postun):	/sbin/depmod
 Provides:	kernel%{_alt_kernel}-misc(nforce) = %{epoch}:%{version}-%{_rel}
+%if "%{_alt_kernel}" == "%{nil}"
 Obsoletes:	kernel-smp-net-nforce
 Obsoletes:	kernel-smp-sound-nforce
+%endif
 Obsoletes:	nforce-doc
 
 %description -n kernel%{_alt_kernel}-smp-misc-%{short_name}
@@ -194,6 +198,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2006/08/07 10:41:52  sparky
+- alt-kernel modules must not conflict with normal ones
+
 Revision 1.26  2006/08/07 10:22:16  qboosh
 - no macros in Obsoletes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-misc-nforce.spec?r1=1.26&r2=1.27&f=u