[arch-commits] Commit in ucarp/trunk (PKGBUILD ucarp.service)

[Sébastien Luttringer]

    Date: Monday, May 13, 2013 @ 02:29:47
  Author: seblu
Revision: 90533

upgpkg: ucarp 1.5.2-5

https://www.archlinux.org/todo/move-files-to-usrbin-if-possible/

Modified:
  ucarp/trunk/PKGBUILD
  ucarp/trunk/ucarp.service

---------------+
 PKGBUILD      |   24 ++++++++++++------------
 ucarp.service |    2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-13 00:28:44 UTC (rev 90532)
+++ PKGBUILD	2013-05-13 00:29:47 UTC (rev 90533)
@@ -3,35 +3,35 @@
 
 pkgname=ucarp
 pkgver=1.5.2
-pkgrel=4
+pkgrel=5
 pkgdesc='Userspace implementation of the CARP protocol'
 arch=('i686' 'x86_64')
 url='http://www.ucarp.org/project/ucarp'
 license=('GPL2')
 depends=('libpcap')
 optdepends=('iproute2')
-source=("http://download.pureftpd.org/pub/ucarp/ucarp-$pkgver.tar.gz"
-        'ucarp.service'
-        'ucarp.8'
+source=("http://download.pureftpd.org/pub/$pkgname/$pkgname-$pkgver.tar.gz"
+        "$pkgname.service"
+        "$pkgname.8"
         '01-fix-getopt.patch'
         '02-fix-downscript-on-error.c')
 md5sums=('e3caa733316a32c09e5d3817617e9145'
-         '40fdef66560e3c98eb7c04adf7c31739'
+         'fdc72a8d6f89224b40c78705df1f46f9'
          '2ccfdc464b88c437b38bd0324cf1fef3'
          '3f20699aaf2ef8139dcd337f1e7f06ab'
          '09d26233c37956cf08e629554a91b8cd')
 
+prepare() {
+  # Apply patches
+  patch -N -p1 -d $pkgname-$pkgver < 01-fix-getopt.patch
+  patch -N -p1 -d $pkgname-$pkgver < 02-fix-downscript-on-error.c
+}
+
 build() {
   cd $pkgname-$pkgver
-  patch -N -p1 -i ../01-fix-getopt.patch
-  patch -N -p1 -i ../02-fix-downscript-on-error.c
-
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sbindir=/usr/bin
   make
 
-  # fix iproute2 path
-  sed -i 's|/sbin|/usr/sbin|g' examples/linux/vip-down.sh
-  sed -i 's|/sbin|/usr/sbin|g' examples/linux/vip-up.sh
 }
 
 package() {

Modified: ucarp.service
===================================================================
--- ucarp.service	2013-05-13 00:28:44 UTC (rev 90532)
+++ ucarp.service	2013-05-13 00:29:47 UTC (rev 90533)
@@ -2,7 +2,7 @@
 Description=UCARP daemon
 
 [Service]
-ExecStart=/usr/sbin/ucarp
+ExecStart=/usr/bin/ucarp
 
 [Install]
 WantedBy=multi-user.target