SPECS (LINUX_2_6): kernel.spec - killed two missing version macros

[hawk]

Author: hawk                         Date: Sat Apr 19 15:17:28 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- killed two missing version macros

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1869 -> 1.441.2.1870) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1869 SPECS/kernel.spec:1.441.2.1870
--- SPECS/kernel.spec:1.441.2.1869	Tue Apr 15 14:00:30 2008
+++ SPECS/kernel.spec	Sat Apr 19 17:17:22 2008
@@ -574,8 +574,8 @@
 Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Obsoletes:	kernel-smp-pcmcia
-Conflicts:	pcmcia-cs < %{_pcmcia_cs_ver}
-Conflicts:	pcmciautils < %{_pcmciautils_ver}
+Conflicts:	pcmcia-cs < 3.1.21
+Conflicts:	pcmciautils < 004
 Autoreqprov:	no
 
 %description pcmcia
@@ -1701,6 +1701,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1870  2008-04-19 15:17:22  hawk
+- killed two missing version macros
+
 Revision 1.441.2.1869  2008-04-15 12:00:30  zbyniu
 - grsec_caps temporary disabled
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1869&r2=1.441.2.1870&f=u