Author: glen Date: Fri Mar 2 21:27:37 2012 GMT Module: packages Tag: HEAD ---- Log message: - -init conflicts with upstart, not base
---- Files affected: packages/systemd: systemd.spec (1.121 -> 1.122) ---- Diffs: ================================================================ Index: packages/systemd/systemd.spec diff -u packages/systemd/systemd.spec:1.121 packages/systemd/systemd.spec:1.122 --- packages/systemd/systemd.spec:1.121 Sun Feb 19 17:36:38 2012 +++ packages/systemd/systemd.spec Fri Mar 2 22:27:32 2012 @@ -18,7 +18,7 @@ Summary(pl.UTF-8): systemd - zarządca systemu i usług dla Linuksa Name: systemd Version: 43 -Release: 2 +Release: 3 License: GPL v2+ Group: Base Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz @@ -95,7 +95,6 @@ Conflicts: pam < 1:1.1.5-5 # ...and sudo hates it Conflicts: sudo < 1:1.7.8p2-4 -Conflicts: upstart BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _libexecdir %{_prefix}/lib @@ -131,6 +130,7 @@ Obsoletes: SysVinit Obsoletes: readahead < 1:1.5.7-3 Obsoletes: virtual(init-daemon) +Conflicts: upstart %description init Install this package when you are ready to final switch to systemd. @@ -765,6 +765,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.122 2012/03/02 21:27:32 glen +- -init conflicts with upstart, not base + Revision 1.121 2012/02/19 16:36:38 sls - BR: libselinux-devel >= 2.1.0 (required libselinux.pc + libsepol.pc) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/systemd/systemd.spec?r1=1.121&r2=1.122&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
