SPECS: rc-scripts.spec - preemptive strike: added commented out conflicts o...

baggins baggins at pld-linux.org
Wed Dec 31 19:59:33 CET 2008


Author: baggins                      Date: Wed Dec 31 18:59:33 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- preemptive strike: added commented out conflicts on dev/udev-core,
  needed for /dev/cpuset directory

---- Files affected:
SPECS:
   rc-scripts.spec (1.289 -> 1.290) 

---- Diffs:

================================================================
Index: SPECS/rc-scripts.spec
diff -u SPECS/rc-scripts.spec:1.289 SPECS/rc-scripts.spec:1.290
--- SPECS/rc-scripts.spec:1.289	Tue Nov  4 21:07:09 2008
+++ SPECS/rc-scripts.spec	Wed Dec 31 19:59:28 2008
@@ -1,5 +1,9 @@
 # $Revision$, $Date$
 #
+# NOTE:
+#	- uncomment dev/udev-core conflicts after update to new version
+#	  and remove this note
+#
 # Conditional build:
 %bcond_without	static		# link binaries with glib dynamically
 #
@@ -55,10 +59,12 @@
 Obsoletes:	initscripts
 Obsoletes:	vserver-rc-scripts
 Conflicts:	LPRng < 3.8.0-2
+#Conflicts:	dev < 2.9.0-22
 Conflicts:	iputils-arping < 2:s20070202-1
 Conflicts:	openssh-server < 2:3.6.1p2-6
 Conflicts:	psacct < 6.3.5-10
 Conflicts:	tzdata < 2007b-1.1
+#Conflicts:	udev-core < 135-2
 Conflicts:	wpa_supplicant < 0.6.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -334,6 +340,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.290  2008/12/31 18:59:28  baggins
+- preemptive strike: added commented out conflicts on dev/udev-core,
+  needed for /dev/cpuset directory
+
 Revision 1.289  2008/11/04 20:07:09  glen
 - 0.4.1.25
 
================================================================

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



More information about the pld-cvs-commit mailing list