[arch-commits] Commit in cryptsetup/trunk (PKGBUILD encrypt_install)

[Eric Bélanger]

    Date: Friday, April 20, 2012 @ 14:28:16
  Author: eric
Revision: 156538

upgpkg: cryptsetup 1.4.1-3

Fix initcpio install hook (close FS#29542), Move library from /lib to /usr/lib

Modified:
  cryptsetup/trunk/PKGBUILD
  cryptsetup/trunk/encrypt_install

-----------------+
 PKGBUILD        |    9 +++------
 encrypt_install |    8 ++++----
 2 files changed, 7 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-20 17:48:38 UTC (rev 156537)
+++ PKGBUILD	2012-04-20 18:28:16 UTC (rev 156538)
@@ -2,7 +2,7 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 pkgname=cryptsetup
 pkgver=1.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt"
 arch=(i686 x86_64)
 license=('GPL')
@@ -18,10 +18,10 @@
 sha256sums=('82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb'
             '71c6506d4b6d0b22b9b6c2a68e604959e4c072af04680ed6acc0126c97bdbc88'
             '811bbea1337106ad811731c746d73ee81039bad00aef52398e3a377ad0766757'
-            'd4380195351b70abf8fcb3cd19461879c55a7a07e4915d1f0365b295b112a573')
+            'ddbbdcb8eff93a3a7622ec633e90d5c0d68e3afbeaf942dc2309adab345047d4')
 build() {
   cd "${srcdir}"/$pkgname-${pkgver}
-  ./configure --prefix=/usr --disable-static --sbindir=/sbin --libdir=/lib
+  ./configure --prefix=/usr --disable-static --sbindir=/sbin
   make
 }
 
@@ -31,7 +31,4 @@
   # install hook
   install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt
   install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt
-  # Fix pkgconfig location
-  install -d -m755 "${pkgdir}"/usr/lib
-  mv "${pkgdir}"/lib/pkgconfig "${pkgdir}"/usr/lib/
 }

Modified: encrypt_install
===================================================================
--- encrypt_install	2012-04-20 17:48:38 UTC (rev 156537)
+++ encrypt_install	2012-04-20 18:28:16 UTC (rev 156538)
@@ -12,10 +12,10 @@
     [ -f "/sbin/cryptsetup" ] && add_binary "/sbin/cryptsetup" "/sbin/cryptsetup"
     [ -f "/usr/sbin/cryptsetup" ] && add_binary "/usr/sbin/cryptsetup" "/sbin/cryptsetup"
     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/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/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
 }
 
 help ()