[arch-commits] Commit in device-mapper/repos (3 files)

[Eric Bélanger]

    Date: Saturday, November 15, 2008 @ 21:11:11
  Author: eric
Revision: 19179

Merged revisions 19174 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/device-mapper/trunk

........
  r19174 | eric | 2008-11-15 21:05:55 -0500 (Sat, 15 Nov 2008) | 2 lines
  
  upgpkg: device-mapper 1.02.29-1
      Upstream update, Added ChangeLog
........

Added:
  device-mapper/repos/testing-i686/ChangeLog
    (from rev 19174, device-mapper/trunk/ChangeLog)
Modified:
  device-mapper/repos/testing-i686/	(properties)
  device-mapper/repos/testing-i686/PKGBUILD

-----------+
 ChangeLog |    5 +++++
 PKGBUILD  |   31 ++++++++++++++++---------------
 2 files changed, 21 insertions(+), 15 deletions(-)


Property changes on: device-mapper/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /device-mapper/trunk:1-10581
   + /device-mapper/trunk:1-19178

Copied: device-mapper/repos/testing-i686/ChangeLog (from rev 19174, device-mapper/trunk/ChangeLog)
===================================================================
--- testing-i686/ChangeLog	                        (rev 0)
+++ testing-i686/ChangeLog	2008-11-16 02:11:11 UTC (rev 19179)
@@ -0,0 +1,5 @@
+2008-11-11  Eric Belanger  <eric at archlinux.org>
+
+	* device-mapper 1.02.29-1
+	* Upstream update
+	* Added ChangeLog

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-11-16 02:08:50 UTC (rev 19178)
+++ testing-i686/PKGBUILD	2008-11-16 02:11:11 UTC (rev 19179)
@@ -1,30 +1,31 @@
 # $Id$
-# Maintainer: Thomas Baechler <thomas at archlinux.org>
+# Maintainer: Eric Belanger <eric at archlinux.org>
+
 pkgname=device-mapper
-pkgver=1.02.27
+pkgver=1.02.29
+_lvmver=2.02.43
 pkgrel=1
 pkgdesc="Device mapper userspace library and tools."
 arch=('i686' 'x86_64')
+url="http://sourceware.org/dm/"
 license=('GPL')
-url="http://sourceware.org/dm/"
 groups=('base')
 depends=('glibc')
-source=(ftp://sources.redhat.com/pub/dm/device-mapper.$pkgver.tgz
-	device-mapper.rules)
-md5sums=('6074f2c2035c2a526422e691c7457277'
-         '065f32a36947e6183722ed9aef13dc0c')
+source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_lvmver}.tgz device-mapper.rules)
+md5sums=('fc34655706a2aa116b92328b24fad619' '065f32a36947e6183722ed9aef13dc0c')
+sha1sums=('28a1f553f53fa568e85b41879bb32d1c11fdd07d' '003f5cf654503dcc9c1ba7c11c7d6e77bf27bb8d')
 
 build() {
-  cd $startdir/src/$pkgname.$pkgver
-  ./configure --prefix=/usr 
-  make || return 1
-  make DESTDIR=$startdir/pkg sbindir=$startdir/pkg/sbin \
-    libdir=$startdir/pkg/lib install
+  cd ${srcdir}/LVM2.${_lvmver}
+  ./configure --prefix=/usr || return 1
+  make device-mapper || return 1
+  make DESTDIR=${pkgdir} sbindir=${pkgdir}/sbin \
+    libdir=${pkgdir}/lib install_device-mapper || return 1
 
   # install the static library as well
-  install -D -m644 lib/ioctl/libdevmapper.a $startdir/pkg/usr/lib/libdevmapper.a
+  install -D -m644 libdm/ioctl/libdevmapper.a ${pkgdir}/usr/lib/libdevmapper.a || return 1
   # install udev rule
-  install -D -m644 $startdir/src/device-mapper.rules $startdir/pkg/etc/udev/rules.d/device-mapper.rules
+  install -D -m644 ${srcdir}/device-mapper.rules ${pkgdir}/etc/udev/rules.d/device-mapper.rules || return 1
   # fix device-mapper link bug
-  ln -sf /lib/libdevmapper.so $startdir/pkg/usr/lib/libdevmapper.so
+  ln -sf /lib/libdevmapper.so ${pkgdir}/usr/lib/libdevmapper.so || return 1
 }