--- a/PKGBUILD 2013-10-14 09:10:18.156331278 -0400 +++ b/PKGBUILD 2013-10-14 10:23:34.481844783 -0400 @@ -3,7 +3,7 @@ # Contributor: Judd Vinet pkgname=mdadm pkgver=3.3 -pkgrel=1 +pkgrel=2 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" arch=(i686 x86_64) license=('GPL') @@ -18,37 +18,40 @@ mdadm_hook mdadm_udev_install mdadm.service + fix-references-to-sbin.patch disable-werror.patch) replaces=('raidtools') md5sums=('8ac04259cdd74b4566c3b6dea9414b57' - '5a37c112aa07dccdde62f9fa5b888607' + 'f069709887371e7582ed3907b1d9abe2' 'af2f73f0094ebee66f503ca4710c7142' 'fbfb7d07efcbaf5dc61af424c5f6e352' 'b6b0bfd6487c99264578630616dfe5eb' 'eb1786b18fa4d13cfd7b71d6b05cfb4f' + '2a24ecfff5c4bb823099de25dc74ab34' '599745ed2bec4489e83991cff89c46ee') prepare() { - cd $srcdir/$pkgname-$pkgver - patch -Np0 -i ../disable-werror.patch + cd "$pkgname-$pkgver" + patch -Np0 -i "$srcdir/disable-werror.patch" + patch -Np1 -i "$srcdir/fix-references-to-sbin.patch" + sed -i '/^MAILCMD/ s,sbin,bin,' Makefile } build() { - cd $srcdir/$pkgname-$pkgver + cd "$pkgname-$pkgver" make CXFLAGS="$CFLAGS" BINDIR=/usr/bin # build static mdassemble for Arch's initramfs - make MDASSEMBLE_AUTO=1 mdassemble - + make BINDIR=/usr/bin MDASSEMBLE_AUTO=1 mdassemble } package() { - cd $srcdir/$pkgname-$pkgver - make INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR=$pkgdir install - install -D -m755 mdassemble $pkgdir/usr/bin/mdassemble - install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf - install -D -m644 ../mdadm_install $pkgdir/usr/lib/initcpio/install/mdadm - install -D -m644 ../mdadm_hook $pkgdir/usr/lib/initcpio/hooks/mdadm - install -D -m644 ../mdadm_udev_install $pkgdir/usr/lib/initcpio/install/mdadm_udev + cd "$pkgname-$pkgver" + make INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR="$pkgdir" install + install -D -m755 mdassemble "$pkgdir/usr/bin/mdassemble" + install -D -m644 ../mdadm.conf "$pkgdir/etc/mdadm.conf" + install -D -m644 ../mdadm_install "$pkgdir/usr/lib/initcpio/install/mdadm" + install -D -m644 ../mdadm_hook "$pkgdir/usr/lib/initcpio/hooks/mdadm" + install -D -m644 ../mdadm_udev_install "$pkgdir/usr/lib/initcpio/install/mdadm_udev" # systemd service file - install -D -m644 $srcdir/mdadm.service $pkgdir/usr/lib/systemd/system/mdadm.service + install -D -m644 "$srcdir/mdadm.service" "$pkgdir/usr/lib/systemd/system/mdadm.service" }