diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-22 00:06:19 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-22 00:06:19 -0300 |
| commit | 45a1b262edf175ecf5dd43e51c8ee72f9d78265b (patch) | |
| tree | c96780037991d6d44cefc8a149e9b88c6bfc6d67 /community/systemd | |
| parent | c034be9e8f973eb6c1dbb77fb4528fad379ddbfd (diff) | |
| parent | 69e1fada8bdc9588d0a3d8bc3403fa809d809a84 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/quvi/PKGBUILD
community/tasks/PKGBUILD
community/xwax/PKGBUILD
core/udev/PKGBUILD
extra/libplist/PKGBUILD
extra/mirage/PKGBUILD
extra/rdesktop/PKGBUILD
staging/gpsd/PKGBUILD
testing/pygobject/PKGBUILD
Diffstat (limited to 'community/systemd')
| -rw-r--r-- | community/systemd/PKGBUILD | 13 | ||||
| -rw-r--r-- | community/systemd/systemd.install | 10 |
2 files changed, 8 insertions, 15 deletions
diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD index 247d802a1..9cf223be6 100644 --- a/community/systemd/PKGBUILD +++ b/community/systemd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 43947 2011-04-01 02:11:49Z dreisner $ +# $Id: PKGBUILD 45374 2011-04-21 02:36:08Z dreisner $ # Maintainer: Dave Reisner <d@falconindy.com> pkgname=systemd -pkgver=22 -pkgrel=2 +pkgver=25 +pkgrel=1 pkgdesc="Session and Startup manager" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" @@ -11,10 +11,11 @@ license=('GPL2') depends=('dbus-core' 'initscripts' 'sysvinit' 'util-linux>=2.19') makedepends=('docbook-xsl' 'libxslt' 'cryptsetup' 'gtk2' 'libnotify') optdepends=('cryptsetup: required for encrypted block devices' - 'initscripts-systemd: native boot and initialization scripts' 'dbus-python: systemd-analyze' 'gtk2: systemadm' + 'initscripts-systemd: native boot and initialization scripts' 'libnotify: systemadm' + 'python2-cairo: systemd-analyze' 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts') groups=('systemd') options=('!libtool') @@ -24,14 +25,14 @@ backup=(etc/systemd/system.conf install=systemd.install source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2" "os-release") -md5sums=('79cfbca526eaa5833723b48adeb0b323' +md5sums=('11c64b4af8ba863d650b6a7339610fc2' 'f9922299150b4adda7b89e10bca33033') build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr \ - --with-rootdir=/ \ + --with-rootdir= \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ --localstatedir=/var \ diff --git a/community/systemd/systemd.install b/community/systemd/systemd.install index 259d09b9e..0c75c4b27 100644 --- a/community/systemd/systemd.install +++ b/community/systemd/systemd.install @@ -1,14 +1,7 @@ -#!/bin/sh +#!/bin/bash checkgroups() { getent group lock >/dev/null || groupadd -g 54 lock - - utmpent=$(getent group utmp) - if [ -z $utmpent ]; then - getent group utmp >/dev/null || groupadd -g 32 utmp - elif [ $(echo $utmpent | cut -d: -f3) = '22' ]; then - groupmod -g 32 utmp - fi } post_install() { @@ -44,7 +37,6 @@ pre_remove() { post_remove() { getent group lock >/dev/null && groupdel lock - getent group utmp >/dev/null && groupdel utmp } # vim:set ts=2 sw=2 et: |