Author: baggins Date: Thu May 31 11:09:43 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- removed conflicts satisfied by requires
---- Files affected:
packages/systemd:
systemd.spec (1.176 -> 1.177)
---- Diffs:
================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.176 packages/systemd/systemd.spec:1.177
--- packages/systemd/systemd.spec:1.176 Thu May 31 12:51:30 2012
+++ packages/systemd/systemd.spec Thu May 31 13:09:38 2012
@@ -135,7 +135,7 @@
Requires: SysVinit-tools
Requires: agetty
Requires: dbus >= 1.4.16-6
-Requires: filesystem >= 4.0-2
+Requires: filesystem >= 4.0-3
Requires: libutempter
Requires: rc-scripts >= 0.4.5.3-7
Requires: setup >= 2.8.0-2
@@ -183,11 +183,9 @@
Conflicts: cassandra-bin < 0.8.9-2
Conflicts: clamav < 0.97.3-3
Conflicts: cups < 1:1.5.0-10
-Conflicts: dbus < 1.4.16-4
Conflicts: dovecot < 1:2.0.16-3
Conflicts: dspam < 3.9.0-6
Conflicts: fail2ban < 0.8.4-4
-Conflicts: filesystem < 4.0-3
Conflicts: gammu-smsd < 1:1.31.0-3
# Break gdm2.20 installs
#Conflicts: gdm < 2:3.2.1.1-9
@@ -225,7 +223,6 @@
Conflicts: pulseaudio-server < 1.1-2
Conflicts: quagga < 0.99.20-3
Conflicts: radvd < 1.8.5-2
-Conflicts: rc-scripts < 0.4.5.2-3
Conflicts: red5 < 0.9.0-2
Conflicts: redis-server < 2.4.2-4
Conflicts: smokeping < 2.4.2-10
@@ -1356,6 +1353,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.177 2012/05/31 11:09:38 baggins
+- removed conflicts satisfied by requires
+
Revision 1.176 2012/05/31 10:51:30 baggins
- preserve renamed systemd-logind.conf and systemd-journald.conf
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/systemd/systemd.spec?r1=1.176&r2=1.177
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
