[packages/systemd] - Conflicts for rc-scripts before crypttab(5) man removal
qboosh
qboosh at pld-linux.org
Sat Apr 20 19:26:51 CEST 2013
commit 8cb53aef719ddb15a047bba1043de39bf069e7e4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Apr 20 19:26:36 2013 +0200
- Conflicts for rc-scripts before crypttab(5) man removal
systemd.spec | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/systemd.spec b/systemd.spec
index c5d41f6..d474567 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -256,6 +256,7 @@ Provides: virtual(init-daemon)
Obsoletes: SysVinit
Obsoletes: readahead < 1:1.5.7-3
Obsoletes: virtual(init-daemon)
+Conflicts: rc-scripts < 0.4.5.5-2
Conflicts: upstart
%description init
@@ -1107,11 +1108,11 @@ fi
%attr(755,root,root) /sbin/runlevel
%attr(755,root,root) /sbin/shutdown
%attr(755,root,root) /sbin/telinit
-%{_mandir}/man1/init.1
+%{_mandir}/man1/init.1*
%{_mandir}/man5/crypttab.5*
%{_mandir}/man8/halt.8*
-%{_mandir}/man8/poweroff.8
-%{_mandir}/man8/reboot.8
+%{_mandir}/man8/poweroff.8*
+%{_mandir}/man8/reboot.8*
%{_mandir}/man8/runlevel.8*
%{_mandir}/man8/shutdown.8*
%{_mandir}/man8/telinit.8*
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/8cb53aef719ddb15a047bba1043de39bf069e7e4
More information about the pld-cvs-commit
mailing list