Date: Saturday, July 21, 2012 @ 09:20:12 Author: dreisner Revision: 163888
upgpkg: systemd 187-2 - revert to python2 for systemd-analyze (FS#30619) - move crypttab(5) to systemd-tools (FS#30778) Modified: systemd/trunk/PKGBUILD ----------+ PKGBUILD | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-07-21 12:16:22 UTC (rev 163887) +++ PKGBUILD 2012-07-21 13:20:12 UTC (rev 163888) @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat') pkgver=187 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -52,10 +52,10 @@ pkgdesc="system and service manager" depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kmod' 'libcap' 'pam' "systemd-tools=$pkgver" 'util-linux' 'xz') - optdepends=('python-dbus: systemd-analyze' - 'initscripts: legacy support for hostname and vconsole setup' + optdepends=('initscripts: legacy support for hostname and vconsole setup' 'initscripts-systemd: legacy generator for initialization scripts' - 'python-cairo: systemd-analyze' + 'python2-cairo: systemd-analyze' + 'python2-dbus: systemd-analyze' 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' 'systemd-sysvcompat: symlink package to provide sysvinit binaries') backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf @@ -87,6 +87,10 @@ rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" rmdir "$pkgdir/etc/systemd/system/getty.target.wants" + # fix systemd-analyze for python2. the 'plot' verb does not work + # with py3k due to a bug in python-cairo + sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" + ### split off libsystemd (libs, includes, pkgconfig, man3) rm -rf "$srcdir/_libsystemd" install -dm755 "$srcdir"/_libsystemd/usr/{include,lib/pkgconfig} @@ -137,7 +141,7 @@ mv "$pkgdir"/usr/share/man/man8/{systemd-{tmpfiles,udevd},udevadm}.8 usr/share/man/man8 mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt,machine-id-setup}.1 usr/share/man/man1 mv "$pkgdir"/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 usr/share/man/man5 - mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf}.5 usr/share/man/man5 + mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf,crypttab}.5 usr/share/man/man5 mv "$pkgdir"/usr/bin/systemd-{ask-password,delta,detect-virt,tmpfiles,tty-ask-password-agent} usr/bin mv "$pkgdir"/usr/lib/systemd/systemd-{ac-power,binfmt,cryptsetup,modules-load,random-seed,remount-fs,reply-password,sysctl,timestamp,vconsole-setup} usr/lib/systemd }