From e7552010f531ef1b114352f0ce71a307360bf1d4 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sat, 6 Oct 2012 00:25:32 -0700
Subject: Sat Oct  6 00:25:32 PDT 2012

---
 core/systemd/PKGBUILD              | 21 +++++----------------
 core/systemd/initcpio-install-udev |  2 +-
 2 files changed, 6 insertions(+), 17 deletions(-)

(limited to 'core/systemd')

diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 8dc086a4a..f895939ef 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -3,29 +3,26 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=193
+pkgver=194
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2' 'LGPL2.1' 'MIT')
 makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
              'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libxslt' 'linux-api-headers'
-             'pam' 'quota-tools' 'xz')
-checkdepends=('python')
+             'pam' 'python' 'quota-tools' 'xz')
 options=('!libtool')
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
         '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() {
@@ -37,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 \
@@ -141,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"
diff --git a/core/systemd/initcpio-install-udev b/core/systemd/initcpio-install-udev
index 762429983..15124b8f7 100644
--- a/core/systemd/initcpio-install-udev
+++ b/core/systemd/initcpio-install-udev
@@ -7,7 +7,7 @@ build() {
     add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd
     add_binary /usr/bin/udevadm
 
-    for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do
+    for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do
         add_file "/usr/lib/udev/rules.d/$rules"
     done
     for tool in ata_id scsi_id; do
-- 
cgit v1.2.3-54-g00ecf