packages (AC-branch): rc-scripts/rc-scripts.spec - udev conflict was too heavy

[glen]

Author: glen                         Date: Wed Jun 16 14:51:25 2010 GMT
Module: packages                      Tag: AC-branch
---- Log message:
- udev conflict was too heavy

---- Files affected:
packages/rc-scripts:
   rc-scripts.spec (1.323 -> 1.323.4.1) 

---- Diffs:

================================================================
Index: packages/rc-scripts/rc-scripts.spec
diff -u packages/rc-scripts/rc-scripts.spec:1.323 packages/rc-scripts/rc-scripts.spec:1.323.4.1
--- packages/rc-scripts/rc-scripts.spec:1.323	Wed Apr  7 09:06:33 2010
+++ packages/rc-scripts/rc-scripts.spec	Wed Jun 16 16:51:20 2010
@@ -10,7 +10,7 @@
 Summary(tr.UTF-8):	inittab ve /etc/rc.d dosyaları
 Name:		rc-scripts
 Version:	0.4.2.8
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Base
 Source0:	ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
@@ -64,10 +64,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:	wpa_supplicant < 0.6.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -346,6 +346,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.323.4.1  2010/06/16 14:51:20  glen
+- udev conflict was too heavy
+
 Revision 1.323  2010/04/07 07:06:33  glen
 - up to 0.4.2.8
 
================================================================

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