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

[Bartłomiej Piotrowski]

    Date: Sunday, October 12, 2014 @ 11:39:20
  Author: bpiotrowski
Revision: 224233

upgpkg: gpsd 3.11-3

fix path to gpsdctl executable in systemd service (FS#42324)

Modified:
  gpsd/trunk/PKGBUILD

----------+
 PKGBUILD |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-12 09:35:53 UTC (rev 224232)
+++ PKGBUILD	2014-10-12 09:39:20 UTC (rev 224233)
@@ -6,7 +6,7 @@
 
 pkgname=gpsd
 pkgver=3.11
-pkgrel=2
+pkgrel=3
 pkgdesc="GPS daemon and library to support USB/serial GPS devices"
 arch=('i686' 'x86_64')
 url="http://catb.org/gpsd/"
@@ -21,7 +21,7 @@
 source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
         'gpsd.conf')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   # fix python 2.7 path
@@ -31,6 +31,12 @@
   sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gegps \
     gpscat gpsfake gpsprof xgps xgpsspeed
 
+  sed -i 's/sbin/bin/g' systemd/*.service
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
   scons prefix=/usr \
         systemd=yes \
         libQgpsmm=no \
@@ -76,10 +82,8 @@
   install -D -m644 systemd/gpsdctl at .service "${pkgdir}/usr/lib/systemd/system/gpsdctl at .service"
 
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
 
-  # move to /usr/bin
-  sed -i -e 's,/usr/sbin,/usr/bin,g' "${pkgdir}/usr/lib/systemd/system/gpsd.service"
-}
 md5sums=('ba28369992886fccb85ce560e4727e20'
          'SKIP'
          '3e963df3f9f7ef3572ecc648ae829315')