Wed Jan 16 00:05:27 PST 2013

1 files changed, 19 insertions, 17 deletions

diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 14a6f7910..8bae20a2b 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=196
-pkgrel=2
+pkgver=197
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2' 'LGPL2.1' 'MIT')
@@ -13,11 +13,13 @@ makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection
              'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz')
 options=('!libtool')
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
+        '0001-dbus-fix-serialization-of-calendar-timers.patch'
         'initcpio-hook-udev'
         'initcpio-install-udev'
         'initcpio-install-timestamp'
         'use-split-usr-path.patch')
-md5sums=('05ebd7f108e420e2b4e4810ea4b3c810'
+md5sums=('56a860dceadfafe59f40141eb5223743'
+         '0341d680d5ab16bab3978bac96bf8797'
          'e99e9189aa2f6084ac28b8ddf605aeb8'
          'fb37e34ea006c79be1c54cbb0f803414'
          'df69615503ad293c9ddf9d8b7755282d'
@@ -29,7 +31,13 @@ build() {
   # hang onto this until we do the /{,s}bin merge
   patch -Np1 <"$srcdir/use-split-usr-path.patch"
 
+  # fix assertion failure when using calendar timers
+  # upstream 3761902e2e120849c283106fd4b78b6adec7367e
+  patch -Np1 <"$srcdir/0001-dbus-fix-serialization-of-calendar-timers.patch"
+
   ./configure \
+      PYTHON=python2 \
+      PYTHON_CONFIG=python2-config \
       --libexecdir=/usr/lib \
       --localstatedir=/var \
       --sysconfdir=/etc \
@@ -37,7 +45,11 @@ build() {
       --enable-gtk-doc \
       --disable-audit \
       --disable-ima \
-      --with-distro=arch
+      --with-sysvinit-path= \
+      --with-sysvrcnd-path=
+
+  # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work.
+  # https://pokersource.info/show_bug.cgi?id=50989
 
   make
 }
@@ -50,9 +62,9 @@ package_systemd() {
   pkgdesc="system and service manager"
   depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt'
            'pam' 'util-linux' 'xz')
-  provides=("libsystemd=$pkgver" "systemd-tools=$pkgver" "udev=$pkgver")
-  replaces=('libsystemd' 'systemd-tools' 'udev')
-  conflicts=('libsystemd' 'systemd-tools' 'udev')
+  provides=("libsystemd=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver")
+  replaces=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev')
+  conflicts=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev')
   optdepends=('cryptsetup: required for encrypted block devices'
               'libmicrohttpd: systemd-journal-gatewayd'
               'quota-tools: kernel-level quota management'
@@ -87,12 +99,6 @@ package_systemd() {
   done
   rm -rf "$pkgdir/etc/bash_completion.d"
 
-  # zsh completion isn't installed as part of 196
-  # http://i.imgur.com/hMJgX.jpg
-  # TODO(dreisner): remove this for 197
-  install -Dm644 "$pkgname-$pkgver/shell-completion/systemd-zsh-completion.zsh" \
-      "$pkgdir/usr/share/zsh/site-functions/_systemd"
-
   # don't write units to /etc by default -- we'll enable this on post_install
   # as a sane default
   rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service"
@@ -101,10 +107,6 @@ package_systemd() {
   # get rid of RPM macros
   rm -r "$pkgdir/etc/rpm"
 
-  # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work.
-  # https://pokersource.info/show_bug.cgi?id=50989
-  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
   # the path to udevadm is hardcoded in some places
   install -d "$pkgdir/sbin"
   ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm"