From bf35116f9d203dcafce808a6c7b3dd5a0db8afbc Mon Sep 17 00:00:00 2001 From: root Date: Tue, 2 Aug 2011 04:35:55 +0000 Subject: Tue Aug 2 04:35:55 UTC 2011 --- community-testing/systemd/PKGBUILD | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) (limited to 'community-testing/systemd/PKGBUILD') diff --git a/community-testing/systemd/PKGBUILD b/community-testing/systemd/PKGBUILD index f344d4d74..0edb31bc1 100644 --- a/community-testing/systemd/PKGBUILD +++ b/community-testing/systemd/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 51746 2011-07-13 22:59:52Z dreisner $ +# $Id: PKGBUILD 52842 2011-07-29 03:30:38Z dreisner $ # Maintainer: Dave Reisner pkgname=systemd -pkgver=30 +pkgver=32 pkgrel=1 pkgdesc="Session and Startup manager" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2') -depends=('dbus-core' 'sysvinit' 'util-linux>=2.19' 'udev>=172') +depends=('dbus-core' 'libcap' 'util-linux>=2.19' 'udev>=172') makedepends=('docbook-xsl' 'libxslt' 'cryptsetup' 'gtk2' 'intltool' 'libnotify') optdepends=('cryptsetup: required for encrypted block devices' 'dbus-python: systemd-analyze' @@ -20,25 +20,35 @@ optdepends=('cryptsetup: required for encrypted block devices' 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts') groups=('systemd') options=('!libtool') -backup=(etc/systemd/system.conf - etc/tmpfiles.d/console.conf - usr/lib/tmpfiles.d/legacy.conf - usr/lib/tmpfiles.d/systemd.conf - usr/lib/tmpfiles.d/x11.conf) +backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf + etc/dbus-1/system.d/org.freedesktop.hostname1.conf + etc/dbus-1/system.d/org.freedesktop.login1.conf + etc/dbus-1/system.d/org.freedesktop.locale1.conf + etc/dbus-1/system.d/org.freedesktop.timedate1.conf + etc/systemd/system.conf + etc/systemd/user.conf + etc/systemd/systemd-logind.conf) install=systemd.install source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2" "os-release") -md5sums=('dafd6d2471e2bf80d35525df9801a40f' +md5sums=('d8d4b42034be8ef403e72d7d2d1d1150' '752636def0db3c03f121f8b4f44a63cd') build() { cd "$srcdir/$pkgname-$pkgver" + # Don't unset locale in getty + # https://bugzilla.redhat.com/show_bug.cgi?id=663900 + sed -i -e '/^Environ.*LANG/s/^/#/' \ + -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4 + ./configure --prefix=/usr \ - --with-rootdir= \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ + --libdir=/usr/lib \ --localstatedir=/var \ + --with-rootdir= \ + --with-rootlibdir=/lib \ --disable-audit \ --disable-tcpwrap @@ -54,7 +64,7 @@ package() { make DESTDIR="$pkgdir" install install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release" - printf "d /run/console 755 root root\n" > "$pkgdir/etc/tmpfiles.d/console.conf" + printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf" # fix systemd-analyze for python2 sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" -- cgit v1.2.3-54-g00ecf