systemd: Build manpages with docbook.

diff --git a/systemd/patches/systemd-36-no_manpages.patch b/systemd/patches/systemd-36-no_manpages.patch
deleted file mode 100644 (file)
index 5c5480f..0000000
--- a/systemd/patches/systemd-36-no_manpages.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -Nur a/Makefile.am b/Makefile.am
---- a/Makefile.am      2011-09-23 18:30:02.000000000 +0200
-+++ b/Makefile.am      2011-10-09 16:44:18.293116056 +0200
-@@ -749,82 +749,13 @@
-         src/dbus-loop.h \
-         src/spawn-agent.h
- 
--MANPAGES = \
--      man/systemd.1 \
--      man/systemctl.1 \
--      man/systemadm.1 \
--      man/systemd-cgls.1 \
--      man/systemd-nspawn.1 \
--      man/systemd-tmpfiles.8 \
--      man/systemd-notify.1 \
--      man/sd_notify.3 \
--      man/sd_readahead.3 \
--      man/sd_booted.3 \
--      man/sd_listen_fds.3 \
--      man/sd_is_fifo.3 \
--      man/systemd.unit.5 \
--      man/systemd.service.5 \
--      man/systemd.socket.5 \
--      man/systemd.mount.5 \
--      man/systemd.automount.5 \
--      man/systemd.swap.5 \
--      man/systemd.timer.5 \
--      man/systemd.path.5 \
--      man/systemd.target.5 \
--      man/systemd.device.5 \
--      man/systemd.snapshot.5 \
--      man/systemd.exec.5 \
--      man/daemon.7 \
--      man/sd-daemon.7 \
--      man/sd-readahead.7 \
--      man/runlevel.8 \
--      man/telinit.8 \
--      man/halt.8 \
--      man/shutdown.8 \
--      man/pam_systemd.8 \
--      man/systemd.conf.5 \
--      man/systemd-logind.conf.5 \
--      man/tmpfiles.d.5 \
--      man/hostname.5 \
--        man/timezone.5 \
--      man/machine-id.5 \
--      man/vconsole.conf.5 \
--      man/locale.conf.5 \
--      man/os-release.5 \
--        man/machine-info.5 \
--      man/modules-load.d.5 \
--      man/sysctl.d.5 \
--        man/systemd-ask-password.1 \
--        man/systemd-loginctl.1
-+MANPAGES =
- 
--if ENABLE_BINFMT
--MANPAGES += \
--      man/binfmt.d.5
--endif
-+MANPAGES_ALIAS =
- 
--MANPAGES_ALIAS = \
--      man/reboot.8 \
--      man/poweroff.8 \
--      man/sd_is_socket.3 \
--      man/sd_is_socket_unix.3 \
--      man/sd_is_socket_inet.3 \
--      man/sd_notifyf.3 \
--      man/init.1
--
--man/reboot.8: man/halt.8
--man/poweroff.8: man/halt.8
--man/sd_is_socket.3: man/sd_is_fifo.3
--man/sd_is_socket_unix.3: man/sd_is_fifo.3
--man/sd_is_socket_inet.3: man/sd_is_fifo.3
--man/sd_notifyf.3: man/sd_notify.3
--man/init.1: man/systemd.1
--
--dist_man_MANS = \
--      $(MANPAGES) \
--      $(MANPAGES_ALIAS)
-+dist_man_MANS =
- 
--nodist_man_MANS = \
--      man/systemd.special.7
-+nodist_man_MANS =
- 
- XML_FILES = \
-       ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}

diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 322aea359a0dcb61d60f8ee905d1a7f40e01cf17..42aee742ed83dc7a83a0f6abd13ebbdb7bdf3c52 100644 (file)
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -5,7 +5,7 @@
 
 name       = systemd
 version    = 36
-release    = 3
+release    = 4
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
@@ -27,6 +27,8 @@ build
                autoconf
                cryptsetup-luks-devel
                dbus-devel
+               docbook-utils
+               docbook-xsl
                gperf
                intltool
                libacl-devel