[arch-commits] Commit in gpsd/trunk (PKGBUILD gpsd-3.11-gpsdctl-service.patch)

[Antonio Rojas]

    Date: Thursday, May 21, 2015 @ 19:34:28
  Author: arojas
Revision: 239621

Update to 3.14

Modified:
  gpsd/trunk/PKGBUILD
Deleted:
  gpsd/trunk/gpsd-3.11-gpsdctl-service.patch

---------------------------------+
 PKGBUILD                        |   17 +++++++----------
 gpsd-3.11-gpsdctl-service.patch |   18 ------------------
 2 files changed, 7 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-21 16:47:57 UTC (rev 239620)
+++ PKGBUILD	2015-05-21 17:34:28 UTC (rev 239621)
@@ -5,8 +5,8 @@
 # Contributor: Giacomo Rizzo <alt at free-os.it>
 
 pkgname=gpsd
-pkgver=3.11
-pkgrel=5
+pkgver=3.14
+pkgrel=1
 pkgdesc="GPS daemon and library to support USB/serial GPS devices"
 arch=('i686' 'x86_64')
 url="http://catb.org/gpsd/"
@@ -19,13 +19,11 @@
 backup=('etc/gpsd.conf')
 install="${pkgname}.install"
 source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
-        'gpsd.conf'
-        'gpsd-3.11-gpsdctl-service.patch')
+        'gpsd.conf')
 validpgpkeys=('3CE764D4FAFF5FA810B203BFADF516D38421F11C') # Eric S. Raymond
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/gpsd-3.11-gpsdctl-service.patch"
 
   # fix python 2.7 path
   sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
@@ -66,11 +64,11 @@
   install -D -m755 gpsd.hotplug "${pkgdir}/usr/lib/udev/gpsd.hotplug"
 
   # GPSD needs RPATH
-  chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgps.so.21.0.0
+  chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgps.so.22.0.0
   chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgpsd.so.22.0.0
   chrpath -r /usr/lib/ \
     "${pkgdir}"/usr/bin/{gpsdecode,gpsctl,gpspipe,gpxlogger,lcdgps,cgps,gpsmon} \
-    "${pkgdir}"/usr/bin/{gpsd,gpsdctl,gps2udp}
+    "${pkgdir}"/usr/bin/{gpsd,gpsdctl,gps2udp,ntpshmmon}
   chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python2.7/site-packages/gps/{clienthelpers,packet}.so
 
   install -D -m644 packaging/X11/xgps.desktop \
@@ -87,7 +85,6 @@
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
-md5sums=('ba28369992886fccb85ce560e4727e20'
+md5sums=('bc7467009b99e07ba461377b5da6c039'
          'SKIP'
-         '3e963df3f9f7ef3572ecc648ae829315'
-         '45932e924a0a415ce3c82d8a118fd7be')
+         '3e963df3f9f7ef3572ecc648ae829315')

Deleted: gpsd-3.11-gpsdctl-service.patch
===================================================================
--- gpsd-3.11-gpsdctl-service.patch	2015-05-21 16:47:57 UTC (rev 239620)
+++ gpsd-3.11-gpsdctl-service.patch	2015-05-21 17:34:28 UTC (rev 239621)
@@ -1,18 +0,0 @@
-diff --git a/systemd/gpsdctl at .service b/systemd/gpsdctl at .service
-index 58c5176..3d1590d 100644
---- a/systemd/gpsdctl at .service
-+++ b/systemd/gpsdctl at .service
-@@ -6,8 +6,9 @@ After=dev-%i.device
- 
- [Service]
- Type=oneshot
--Environment="GPSD_SOCKET=/var/run/gpsd.sock"
--EnvironmentFile=-/etc/default/gpsd
-+EnvironmentFile=/etc/gpsd.conf
- RemainAfterExit=yes
--ExecStart=/bin/sh -c "[ \"$USBAUTO\" = true ] && /usr/sbin/gpsdctl add /dev/%I || :"
--ExecStop=/bin/sh -c "[ \"$USBAUTO\" = true ] && /usr/sbin/gpsdctl remove /dev/%I || :"
-+
-+ExecStartPre=/usr/bin/chmod a+rw /dev/%I
-+ExecStart=/usr/bin/gpsdctl add /dev/%I
-+ExecStop=/usr/bin/gpsdctl remove /dev/%I