[arch-commits] Commit in gpsd/trunk (LICENSE PKGBUILD gpsd)
Andrea Scarpino
andrea at archlinux.org
Fri Aug 19 16:38:40 UTC 2011
Date: Friday, August 19, 2011 @ 12:38:40
Author: andrea
Revision: 135847
upgpkg: gpsd 3.0-1
upstream release
Modified:
gpsd/trunk/PKGBUILD
gpsd/trunk/gpsd
Deleted:
gpsd/trunk/LICENSE
----------+
LICENSE | 38 --------------------------------
PKGBUILD | 71 ++++++++++++++++++++++++++++++-------------------------------
gpsd | 2 -
3 files changed, 37 insertions(+), 74 deletions(-)
Deleted: LICENSE
===================================================================
--- LICENSE 2011-08-19 13:38:41 UTC (rev 135846)
+++ LICENSE 2011-08-19 16:38:40 UTC (rev 135847)
@@ -1,38 +0,0 @@
- COPYRIGHTS
-
-Compilation copyright is held by the GPSD project. All rights reserved.
-
-GPSD project copyrights are assigned to the project lead, currently
-Eric S. Raymond. Other portions of the GPSD code are Copyright (c)
-1997, 1998, 1999, 2000, 2001, 2002 by Remco Treffkorn, and others
-Copyright (c) 2005 by Eric S. Raymond. For other copyrights, see
-individual files.
-
- BSD LICENSE
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:<P>
-
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.<P>
-
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.<P>
-
-Neither name of the GPSD project nor the names of its contributors
-may be used to endorse or promote products derived from this software
-without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-08-19 13:38:41 UTC (rev 135846)
+++ PKGBUILD 2011-08-19 16:38:40 UTC (rev 135847)
@@ -5,73 +5,74 @@
# Contributor: Giacomo Rizzo <alt at free-os.it>
pkgname=gpsd
-pkgver=2.96
+pkgver=3.0
pkgrel=1
pkgdesc="GPS daemon and library to support USB/serial GPS devices"
arch=('i686' 'x86_64')
url="http://gpsd.berlios.de"
license=('BSD')
-depends=('lesstif' 'libxaw' 'python2' 'pth' 'libusb' 'desktop-file-utils')
+depends=('python2' 'libusb' 'bluez' 'desktop-file-utils')
optdepends=('php: generate a PHP status page for your GPS'
'php-gd: image support for the PHP status page')
-makedepends=('docbook-xsl')
+makedepends=('scons' 'docbook-xsl' 'chrpath')
backup=('etc/conf.d/gpsd' 'lib/udev/rules.d/99-gpsd-usb.rules')
-options=('!libtool')
+options=('!libtool' '!buildflags')
install="${pkgname}.install"
source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- 'gpsd' 'LICENSE')
-md5sums=('26a7a04d4298bc3a3a5d89fef4582b64'
- 'e287d4b34a4eb1da27f12533ae9b6dd5'
- 'd217a23f408e91c94359447735bc1800')
+ 'gpsd')
+md5sums=('c63d41a26868e9bdd48d9e311a9cc42c'
+ 'e287d4b34a4eb1da27f12533ae9b6dd5')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- # install python to the same DESTDIR given make
- sed -i 's|--prefix=${prefix} # --root=$(DESTDIR)|--prefix=${prefix} --root=$(DESTDIR)|' Makefile.am Makefile.in
+ # fix python 2.7 path
+ sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+ $(find . -name '*.py')
+ sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gegps gpscat gpsfake \
+ gpsprof xgps xgpsspeed
- # fix python 2.7 path
- sed -i 's|/usr/bin/python|/usr/bin/python2|' gpsd.hotplug{,.wrapper}
- sed -i 's|/usr/bin/python2.6|/usr/bin/python2|' valgrind-audit
- sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gpscat \
- gpsfake gpsprof xgps xgpsspeed gps/gps.py
-
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
- --disable-libQgpsmm \
- --disable-static
- make
+ scons prefix=/usr \
+ systemd=yes \
+ libQgpsmm=no \
+ PYTHONPATH=/usr/bin/python2
+ scons build
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- # Fix man pages path (FS#21715)
- sed -i 's|.so gps.1|.so man1/gps.1|' cgps.1 lcdgps.1 xgps.1 xgpsspeed.1
+ export DESTDIR="${pkgdir}"
+ scons install
- make DESTDIR="${pkgdir}" install
-
# Our own udev-install since the Makefile uses absolute paths
# Original file names are [mostly] unmodified: useful to match process name in case of error
# Following the switch from hotplug to udev helper scripts now live in /lib/udev/ instead of /etc/hotplug/
- sed -i 's|GPSD_OPTIONS=""|GPSD_OPTIONS="-P /var/run/gpsd.pid"|' packaging/deb/etc_default_gpsd
+ sed -i 's|GPSD_OPTIONS=""|GPSD_OPTIONS="-P /var/run/gpsd/gpsd.pid"|' packaging/deb/etc_default_gpsd
sed -i 's|"/var/run/gpsd.sock"|"/var/run/gpsd/gpsd.sock"|' packaging/deb/etc_default_gpsd
install -D -m644 "packaging/deb/etc_default_gpsd" "${pkgdir}/etc/conf.d/gpsd"
- sed -i 's|Id: gpsd.rules|Id: 99-gpsd-usb.rules|' gpsd.rules
install -D -m644 "gpsd.rules" "${pkgdir}/lib/udev/rules.d/99-gpsd-usb.rules"
- sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug.wrapper
- install -D -m755 gpsd.hotplug.wrapper "${pkgdir}/lib/udev/gpsd.hotplug.wrapper"
-
- # Patch a path bug. Check to see if fixed in ensuing releases
- sed -i 's|gpsdcmd = "gpsd %s|gpsdcmd = "/usr/sbin/gpsd %s|' gpsd.hotplug
+ sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug
install -D -m755 gpsd.hotplug "${pkgdir}/lib/udev/gpsd.hotplug"
- install -D -m644 packaging/X11/xgps.desktop ${pkgdir}/usr/share/applications/xgps.desktop
- install -D -m644 packaging/X11/xgpsspeed.desktop ${pkgdir}/usr/share/applications/xgpsspeed.desktop
- install -D -m644 packaging/X11/gpsd-logo.png ${pkgdir}/usr/share/gpsd/gpsd-logo.png
+ # GPSD needs RPATH
+ chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgps{,d}.so.20.0.0
+ chrpath -r /usr/lib/ "${pkgdir}"/usr/bin/{gpsdecode,gpsctl,gpspipe,gpxlogger,lcdgps}
+ chrpath -r /usr/lib/ "${pkgdir}"/usr/sbin/{gpsd,gpsdctl}
+ install -D -m644 packaging/X11/xgps.desktop \
+ "${pkgdir}/usr/share/applications/xgps.desktop"
+ install -D -m644 packaging/X11/xgpsspeed.desktop \
+ "${pkgdir}/usr/share/applications/xgpsspeed.desktop"
+ install -D -m644 packaging/X11/gpsd-logo.png \
+ "${pkgdir}/usr/share/gpsd/gpsd-logo.png"
+
install -D -m755 "${srcdir}/gpsd" "${pkgdir}/etc/rc.d/gpsd"
- install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
+md5sums=('c63d41a26868e9bdd48d9e311a9cc42c'
+ '0d5879df32833ca67a5491ce1ff98dcc')
Modified: gpsd
===================================================================
--- gpsd 2011-08-19 13:38:41 UTC (rev 135846)
+++ gpsd 2011-08-19 16:38:40 UTC (rev 135847)
@@ -26,7 +26,7 @@
if [ $? -gt 0 ]; then
stat_fail
else
- rm -f /var/run/$PID.pid &>/dev/null
+ rm -f /var/run/gpsd/$PID.pid &>/dev/null
rm_daemon gpsd
stat_done
fi
More information about the arch-commits
mailing list