[arch-commits] Commit in lvm2/trunk (PKGBUILD lvm2_install)

[Eric Bélanger]

    Date: Thursday, April 19, 2012 @ 22:14:14
  Author: eric
Revision: 156514

upgpkg: lvm2 2.02.95-2

Fix lvmdump script; Move libraries, initcpio hooks and udev rules from /lib to /usr/lib (close FS#28934 & FS#28932)

Modified:
  lvm2/trunk/PKGBUILD
  lvm2/trunk/lvm2_install

--------------+
 PKGBUILD     |   16 +++++++---------
 lvm2_install |   10 +++++-----
 2 files changed, 12 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-20 01:11:09 UTC (rev 156513)
+++ PKGBUILD	2012-04-20 02:14:14 UTC (rev 156514)
@@ -5,7 +5,7 @@
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
 pkgver=2.02.95
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
@@ -16,18 +16,16 @@
         11-dm-initramfs.rules)
 sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85'
           '45f5e31045065e7bdf5d6f2e21c857b4978024b4'
-          '7f108b2f2056eb050fc898bf5190ecf9145aed8a'
+          '08007f13cf1a9caf6e4aca76dd2ed6a4ab037601'
           '7d63aa838703c9f986531a78164b556f765f5cce'
           'f6a554eea9557c3c236df2943bb6e7e723945c41')
 
 build() {
   cd "${srcdir}/LVM2.${pkgver}"
-  sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh
   unset LDFLAGS
-  ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \
-    --includedir=/usr/include --with-usrlibdir=/usr/lib \
+  ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var \
     --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \
-    --with-udevdir=/lib/udev/rules.d/ --enable-udev_sync --enable-udev_rules
+    --enable-udev_sync --enable-udev_rules
   make
 }
 
@@ -39,7 +37,7 @@
   cd "${srcdir}/LVM2.${pkgver}"
   make DESTDIR="${pkgdir}" install_device-mapper
   # extra udev rule for device-mapper in initramfs
-  install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/lib/initcpio/udev/11-dm-initramfs.rules"
+  install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules"
 }
 
 package_lvm2() {
@@ -56,6 +54,6 @@
   # /etc directories
   install -d "${pkgdir}"/etc/lvm/{archive,backup}
   # mkinitcpio hook
-  install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2"
-  install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2"
+  install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2"
+  install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2"
 }

Modified: lvm2_install
===================================================================
--- lvm2_install	2012-04-20 01:11:09 UTC (rev 156513)
+++ lvm2_install	2012-04-20 02:14:14 UTC (rev 156514)
@@ -9,11 +9,11 @@
 
     add_binary "/sbin/lvm"
     add_binary "/sbin/dmsetup"
-    add_file "/lib/udev/rules.d/10-dm.rules"
-    add_file "/lib/udev/rules.d/13-dm-disk.rules"
-    add_file "/lib/udev/rules.d/95-dm-notify.rules"
-    add_file "/lib/udev/rules.d/11-dm-lvm.rules"
-    add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules"
+    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"
+    add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
+    add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
 }
 
 help ()