From c3ff6b4da8966c22dcbf0f5d8a957b875242789f Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Thu, 4 Oct 2012 01:23:34 -0700
Subject: Thu Oct  4 01:23:34 PDT 2012

---
 staging/systemd/PKGBUILD | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'staging/systemd/PKGBUILD')

diff --git a/staging/systemd/PKGBUILD b/staging/systemd/PKGBUILD
index d29f4d172..18c285073 100644
--- a/staging/systemd/PKGBUILD
+++ b/staging/systemd/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=193
+pkgver=194
 pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
@@ -17,14 +17,12 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-install-udev'
         'initcpio-install-timestamp'
         '0001-Reinstate-TIMEOUT-handling.patch'
-        '0001-tmpfiles-restore-previous-behavior-for-F-f.patch'
         'use-split-usr-path.patch')
-md5sums=('732a9de2b1d2a15cab639c987ff9e90e'
+md5sums=('0ebb73aea444693b9b86f7a76f5df23c'
          'e99e9189aa2f6084ac28b8ddf605aeb8'
-         '59e91c4d7a69b7bf12c86a9982e37ced'
+         'fb37e34ea006c79be1c54cbb0f803414'
          'df69615503ad293c9ddf9d8b7755282d'
          '5543be25f205f853a21fa5ee68e03f0d'
-         '1f435290db227c3a4f4396f86819227e'
          'fd5b5f04ab0a847373d357555129d4c0')
 
 build() {
@@ -36,9 +34,6 @@ build() {
   # hang onto this until we do the /{,s}bin merge
   patch -Np1 <"$srcdir/use-split-usr-path.patch"
 
-  # upstream commit 1845fdd967d3a4c06f895413505de3c2429955b0
-  patch -Np1 <"$srcdir/0001-tmpfiles-restore-previous-behavior-for-F-f.patch"
-
   ./configure \
       --libexecdir=/usr/lib \
       --localstatedir=/var \
@@ -140,14 +135,9 @@ package_systemd() {
 
 package_systemd-sysvcompat() {
   pkgdesc="sysvinit compat for systemd"
-  conflicts=('sysvinit' 'initscripts')
+  conflicts=('sysvinit')
   depends=('sysvinit-tools')
 
-  # the initscripts conflict here isn't actually needed, but in order to make
-  # this package remove both sysvinit and initscripts, the initscripts conflict
-  # is needed. There's no case in which you would ever want initscripts installed
-  # without sysvinit, and vice versa, as in both cases, they are unusable.
-
   mv "$srcdir/_sysvcompat"/* "$pkgdir"
 
   install -dm755 "$pkgdir/sbin"
-- 
cgit v1.2.3-54-g00ecf