[arch-commits] Commit in dmraid/repos (testing-x86_64 testing-x86_64/PKGBUILD)

[Tobias Powalowski]

    Date: Sunday, October 5, 2008 @ 14:17:33
  Author: tpowa
Revision: 14315

Merged revisions 14314 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/dmraid/trunk

........
  r14314 | tpowa | 2008-10-05 18:16:23 +0000 (So, 05 Okt 2008) | 1 line
  
  upgpkg: dmraid 1.0.0.rc15-2
........

Modified:
  dmraid/repos/testing-x86_64/	(properties)
  dmraid/repos/testing-x86_64/PKGBUILD

----------+
 PKGBUILD |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)


Property changes on: dmraid/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /dmraid/trunk:1-13517
   + /dmraid/trunk:1-14314

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-10-05 18:16:23 UTC (rev 14314)
+++ testing-x86_64/PKGBUILD	2008-10-05 18:17:33 UTC (rev 14315)
@@ -4,7 +4,7 @@
 
 pkgname=dmraid
 pkgver=1.0.0.rc15
-pkgrel=1
+pkgrel=2
 pkgdesc="Device mapper RAID interface"
 url="http://people.redhat.com/~heinzm/sw/dmraid/"
 depends=(device-mapper)
@@ -18,21 +18,23 @@
 	 '8c944cab8c885192a90e518a8d794adf')
 
 build() {
-  cd $startdir/src/$pkgname/$pkgver
+  cd $srcdir/$pkgname/$pkgver
 
   # create static bin
   ./configure --enable-static_link --prefix=/usr
   make || return 1
-  make DESTDIR=$startdir/pkg exec_prefix=$startdir/pkg/usr install
-  mv $startdir/pkg/usr/sbin/dmraid $startdir/pkg/usr/sbin/dmraid.static
+  make DESTDIR=$startdir/pkg exec_prefix=$pkgdir/usr install
+  mv $pkgdir/usr/sbin/dmraid $pkgdir/usr/sbin/dmraid.static
 
   # create dynamic linked bin
   ./configure --prefix=/usr
   make || return 1
-  make DESTDIR=$startdir/pkg exec_prefix=$startdir/pkg/usr install
-  mkdir -p $startdir/pkg/var/lock/dmraid
-  chmod 1777 $startdir/pkg/var/lock/
+  make DESTDIR=$pkgdir exec_prefix=$pkgdir/usr install
+  mkdir -p $pkgdir/var/lock/dmraid
+  chmod 1777 $pkgdir/var/lock/
 
-  install -D -m755 $startdir/src/dmraid_install $startdir/pkg/lib/initcpio/install/dmraid
-  install -D -m755 $startdir/src/dmraid_hook $startdir/pkg/lib/initcpio/hooks/dmraid
+  install -D -m755 $srcdir/dmraid_install $pkgdir/lib/initcpio/install/dmraid
+  install -D -m755 $srcdir/dmraid_hook $pkgdir/lib/initcpio/hooks/dmraid
+  # fix .a file
+  chmod 644 $pkgdir/usr/lib/libdmraid.a
 }