packages: rc-scripts/rc-scripts.spec - udev conflict was too heavy for ac

[glen]

Author: glen                         Date: Wed Jun 16 16:20:41 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- udev conflict was too heavy for ac

---- Files affected:
packages/rc-scripts:
   rc-scripts.spec (1.329 -> 1.330) 

---- Diffs:

================================================================
Index: packages/rc-scripts/rc-scripts.spec
diff -u packages/rc-scripts/rc-scripts.spec:1.329 packages/rc-scripts/rc-scripts.spec:1.330
--- packages/rc-scripts/rc-scripts.spec:1.329	Tue Jun 15 13:39:33 2010
+++ packages/rc-scripts/rc-scripts.spec	Wed Jun 16 18:20:36 2010
@@ -62,10 +62,10 @@
 Conflicts:	openssh-server < 2:3.6.1p2-6
 Conflicts:	psacct < 6.3.5-10
 Conflicts:	tzdata < 2007b-1.1
-%if "%{pld_release}" == "ti"
-Conflicts:	udev-core < 1:124-3
-%else
+%if "%{pld_release}" == "th"
 Conflicts:	udev-core < 1:135-2
+%else
+Conflicts:	udev-core < 1:124-3
 %endif
 Conflicts:	upstart-SysVinit < 2.86-25
 Conflicts:	wpa_supplicant < 0.6.3
@@ -350,6 +350,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.330  2010/06/16 16:20:36  glen
+- udev conflict was too heavy for ac
+
 Revision 1.329  2010/06/15 11:39:33  jajcus
 - Version: 0.4.3.3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts.spec?r1=1.329&r2=1.330&f=u