Tue Jun 4 00:27:56 PDT 2013

5 files changed, 23 insertions, 22 deletions

diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD
index f34523f4d..fe6c368a2 100644
--- a/core/lvm2/PKGBUILD
+++ b/core/lvm2/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 177953 2013-02-12 12:13:50Z thomas $
+# $Id: PKGBUILD 187034 2013-06-03 11:15:24Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
 pkgver=2.02.98
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
+makedepends=('systemd')
 groups=('base')
 source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
         lvm2_install
@@ -21,24 +22,24 @@ source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
         lvmetad.service
         lvmetad.socket)
 sha1sums=('077425115b164c335a9930df745943e9ea666a8a'
-          '4713c852fc668e6fbd36ff7c6b5675b10a95a0f8'
-          '8008547b133af89f79461a6df5412539ed3f26b7'
+          'SKIP'
+          '76e83966d1bc84f9a1e30bcaff84b8b8fefbca0f'
           'ff0fdf0a3005a41acd4b36865056109effc3474b'
           'f6a554eea9557c3c236df2943bb6e7e723945c41'
           'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4'
-          'cbc64f377fbb1c1a9ff53bc6ca85c324075499b7'
+          '01782ce8e10718c1513e3906b126f30f682f5cab'
           '1d56f47a81350ae37ffbf61ee036fe31f4c5d504'
-          'ae945cae2d71b286439a9945876acb78dc9eeaf7'
-          '460b094e8689298ed59842d1abcee5d4e706e1d7'
+          'adf26f5e5636de9c055b2ac3b179641a543a8937'
+          'f857a4a63fcc604a981e56875edda91767d4f1bf'
           'fcfc265e3b10294cc4b10949a342e9db4310b186')
 
 build() {
   cd "${srcdir}/LVM2.${pkgver}"
   unset LDFLAGS
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-udev-prefix=/usr \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system --with-default-pid-dir=/run \
-    --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm \
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \
+    --with-udev-prefix=/usr --with-systemdsystemunitdir=/usr/lib/systemd/system \
+    --with-default-pid-dir=/run --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm \
     --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \
     --enable-udev_sync --enable-udev_rules --with-default-locking-dir=/run/lock/lvm \
     --enable-lvmetad
@@ -48,7 +49,7 @@ build() {
 package_device-mapper() {
   pkgdesc="Device mapper userspace library and tools"
   url="http://sourceware.org/dm/"
-  depends=('glibc' 'udev')
+  depends=('glibc' 'systemd')
 
   cd "${srcdir}/LVM2.${pkgver}"
   make DESTDIR="${pkgdir}" install_device-mapper
@@ -63,7 +64,7 @@ package_device-mapper() {
 
 package_lvm2() {
   pkgdesc="Logical Volume Manager 2 utilities"
-  depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline')
+  depends=('bash' "device-mapper>=${pkgver}" 'systemd' 'readline')
   conflicts=('lvm' 'mkinitcpio<0.7')
   backup=('etc/lvm/lvm.conf')
   options=('!makeflags')
diff --git a/core/lvm2/dmeventd.service b/core/lvm2/dmeventd.service
index 15ca21c0b..e0b1b33d0 100644
--- a/core/lvm2/dmeventd.service
+++ b/core/lvm2/dmeventd.service
@@ -7,8 +7,8 @@ DefaultDependencies=no
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/dmeventd
-ExecReload=/usr/sbin/dmeventd -R
+ExecStart=/usr/bin/dmeventd
+ExecReload=/usr/bin/dmeventd -R
 Environment=SD_ACTIVATION=1
 PIDFile=/run/dmeventd.pid
 OOMScoreAdjust=-1000
diff --git a/core/lvm2/lvm-monitoring.service b/core/lvm2/lvm-monitoring.service
index 8f5247b00..138e91a08 100644
--- a/core/lvm2/lvm-monitoring.service
+++ b/core/lvm2/lvm-monitoring.service
@@ -10,8 +10,8 @@ Conflicts=shutdown.target
 [Service]
 Type=oneshot
 Environment=LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES=1
-ExecStart=/usr/sbin/lvm vgchange --monitor y
-ExecStop=/usr/sbin/lvm vgchange --monitor n
+ExecStart=/usr/bin/lvm vgchange --monitor y
+ExecStop=/usr/bin/lvm vgchange --monitor n
 RemainAfterExit=yes
 
 [Install]
diff --git a/core/lvm2/lvm2_install b/core/lvm2/lvm2_install
index be27614bd..6f3c1cb41 100644
--- a/core/lvm2/lvm2_install
+++ b/core/lvm2/lvm2_install
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/bash
 
 build() {
     local mod
@@ -6,9 +6,9 @@ build() {
         add_module "$mod"
     done
 
-    add_binary "/usr/sbin/lvm"
-    add_binary "/usr/sbin/lvmetad"
-    add_binary "/usr/sbin/dmsetup"
+    add_binary "/usr/bin/lvm"
+    add_binary "/usr/bin/lvmetad"
+    add_binary "/usr/bin/dmsetup"
     add_file "/usr/lib/udev/rules.d/10-dm.rules"
     add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
     add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
diff --git a/core/lvm2/lvmetad.service b/core/lvm2/lvmetad.service
index 64168f465..4be520a3b 100644
--- a/core/lvm2/lvmetad.service
+++ b/core/lvm2/lvmetad.service
@@ -9,8 +9,8 @@ Conflicts=shutdown.target
 [Service]
 Type=forking
 NonBlocking=true
-ExecStart=/usr/sbin/lvmetad
-ExecReload=/usr/sbin/lvmetad -R
+ExecStart=/usr/bin/lvmetad
+ExecReload=/usr/bin/lvmetad -R
 Environment=SD_ACTIVATION=1
 Restart=on-abort
 PIDFile=/run/lvmetad.pid