From 0784ed7ecc190ffca58ccf723330b857a53bd91d6430319dabdc095bbd55a81f Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 26 Mar 2008 15:13:14 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gpsd?expand=0&rev=2 --- .gitattributes | 2 + gpsd-2.36.tar.bz2 | 3 - gpsd-2.37.tar.bz2 | 3 + undeffix.diff => gpsd-undeffix.patch | 0 gpsd.changes | 19 ++++ gpsd.spec | 127 ++++++++++++++++++--------- gpsd.xpm | 3 + xgps.desktop | 10 +++ xgpsspeed.desktop | 10 +++ 9 files changed, 133 insertions(+), 44 deletions(-) delete mode 100644 gpsd-2.36.tar.bz2 create mode 100644 gpsd-2.37.tar.bz2 rename undeffix.diff => gpsd-undeffix.patch (100%) create mode 100644 gpsd.xpm create mode 100644 xgps.desktop create mode 100644 xgpsspeed.desktop diff --git a/.gitattributes b/.gitattributes index 9b03811..4c1a495 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,3 +21,5 @@ *.xz filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text +## Specific LFS patterns +gpsd.xpm filter=lfs diff=lfs merge=lfs -text diff --git a/gpsd-2.36.tar.bz2 b/gpsd-2.36.tar.bz2 deleted file mode 100644 index 226342f..0000000 --- a/gpsd-2.36.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b3a9c385f821a462441e8c409201b297963eeabd09008fa9ef23abfde45a14f -size 586666 diff --git a/gpsd-2.37.tar.bz2 b/gpsd-2.37.tar.bz2 new file mode 100644 index 0000000..cf8c8e9 --- /dev/null +++ b/gpsd-2.37.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4995b15af14517d27545f0a604aecf6eff32bbc37d29f7e5140975885c76f714 +size 542586 diff --git a/undeffix.diff b/gpsd-undeffix.patch similarity index 100% rename from undeffix.diff rename to gpsd-undeffix.patch diff --git a/gpsd.changes b/gpsd.changes index b334a64..53a6121 100644 --- a/gpsd.changes +++ b/gpsd.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Sat Mar 22 20:02:15 CET 2008 - lrupp@suse.de + +- update to 2.37 + Fixes: + + C++ bindings + + Garmin USB support + + multiple instances of ntp pps thread starting + + better handling of odd PPS signals + + eye candy in the php visualizers +- enable Garmin Simple Text support +- enable True North Technologies support +- disable static +- mark man files as %doc +- added desktop entries +- fix ldconfig calls +- clean buildroot +- PreReq coreutils and fillup_prereq for postinstall + ------------------------------------------------------------------- Fri Jan 18 16:41:27 CET 2008 - jreuter@suse.de diff --git a/gpsd.spec b/gpsd.spec index b1ce89e..eb36539 100644 --- a/gpsd.spec +++ b/gpsd.spec @@ -1,5 +1,5 @@ # -# spec file for package gpsd (Version 2.36) +# spec file for package gpsd (Version 2.37) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -10,22 +10,30 @@ # norootforbuild + Name: gpsd +Summary: Service daemon for mediating access to a GPS License: BSD 3-Clause Url: http://gpsd.berlios.de/ Group: Hardware/Other -Version: 2.36 +Version: 2.37 Release: 1 -Summary: Service daemon for mediating access to a GPS -BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: udev +PreReq: coreutils %fillup_prereq +BuildRequires: gcc-c++ ncurses-devel openmotif openmotif-devel python-devel udev xmlto +BuildRequires: dbus-1-devel dbus-1-glib-devel update-desktop-files +%if 0%{?suse_version} > 1020 +BuildRequires: fdupes +%endif Source: %{name}-%{version}.tar.bz2 Source1: rules.gpsd Source2: udev.gpsd Source3: sysconfig.gpsd -Patch: undeffix.diff -BuildRequires: gcc-c++ ncurses-devel openmotif openmotif-devel python-devel udev xmlto -#B#uildRequires: dbus-1-devel dbus-1-glib-devel +Source4: gpsd.xpm +Source5: xgps.desktop +Source6: xgpsspeed.desktop +Patch: gpsd-undeffix.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description gpsd is a service daemon that mediates access to a GPS sensor connected @@ -59,12 +67,13 @@ Authors: Chris Kuethe Ville Nuorvala -%package -n gpsd-devel +%package devel Summary: Client libraries in C and Python for talking to a running gpsd or GPS Group: Hardware/Other -Requires: gpsd +Requires: %name = %version +Requires: pkgconfig -%description -n gpsd-devel +%description devel This package provides C header files for the gpsd shared libraries that manage access to a GPS for applications; also Python modules. You will need to have gpsd installed for it to work. @@ -83,11 +92,11 @@ Authors: Chris Kuethe Ville Nuorvala -%package -n gpsd-clients +%package clients Summary: Clients for gpsd with an X interface Group: Hardware/Other -%description -n gpsd-clients +%description clients xgps is a simple test client for gpsd with an X interface. It displays current GPS position/time/velocity information and (for GPSes that support the feature) the locations of accessible satellites. @@ -119,9 +128,11 @@ Authors: %patch -p0 %build -%configure -#%#configure --enable-dbus -%__make +%configure --disable-static \ + --enable-dbus \ + --enable-garmintxt \ + --enable-tnt +%__make %{?jobs:-j%jobs} %install %makeinstall @@ -129,24 +140,46 @@ install -d -m 755 %{buildroot}/lib/udev install -d -m 755 %{buildroot}/etc/udev/rules.d install -d -m 755 %{buildroot}/var/adm/fillup-templates install -d -m 755 %{buildroot}%py_sitedir +install -d -m 755 %{buildroot}%{_datadir}/{applications,pixmaps} install -m 644 %{SOURCE1} %{buildroot}/etc/udev/rules.d/51-gpsd.rules install -m 755 %{SOURCE2} %{buildroot}/lib/udev/gpsd.sh install -m 644 %{SOURCE3} %{buildroot}/var/adm/fillup-templates install -m 644 gpsfake.py %{buildroot}%{py_sitedir} install -m 755 gps.py %{buildroot}%{py_sitedir} +# remove /usr/bin/env call +for i in gpscat gpsfake gpsprof; do + sed -i "s|/usr/bin/env python|/usr/bin/python|g" %{buildroot}%{_bindir}/$i +done +sed -i "s|/usr/bin/env python|/usr/bin/python|g" %{buildroot}%{py_sitedir}/gps.py +# remove .la files +rm -f %{buildroot}%{_libdir}/libgps.la +# install desktop entries +install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/pixmaps/%{name}.xpm +install -m 644 %{SOURCE5} %{buildroot}%{_datadir}/applications/ +install -m 644 %{SOURCE6} %{buildroot}%{_datadir}/applications/ +%suse_update_desktop_file xgpsspeed +%suse_update_desktop_file xgps +# save some space, create symlinks +%if 0%{?suse_version} > 1020 +%fdupes -s %buildroot +%endif %clean +rm -rf %{buildroot} -%post +%post +/sbin/ldconfig %fillup_only -n gpsd -%run_ldconfig -%postun -%run_ldconfig +%postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc README INSTALL COPYING gpsd.php +%doc %{_mandir}/man?/gpsd.* +%doc %{_mandir}/man?/gpsprof.* +%doc %{_mandir}/man?/gpsctl.* +%doc %{_mandir}/man?/sirfmon.* /lib/udev/gpsd.sh %config(noreplace) /etc/udev/rules.d/* %{_sbindir}/gpsd @@ -154,16 +187,19 @@ install -m 755 gps.py %{buildroot}%{py_sitedir} %{_bindir}/gpsprof %{_bindir}/sirfmon %{_libdir}/libgps.so.* -%{_mandir}/man?/gpsd.* -%{_mandir}/man?/gpsprof.* -%{_mandir}/man?/gpsctl.* -%{_mandir}/man?/sirfmon.* %{py_sitedir}/gps.py* /var/adm/fillup-templates/sysconfig.gpsd -%files -n gpsd-devel +%files devel %defattr(-,root,root) %doc README INSTALL COPYING TODO +%doc %{_mandir}/man?/gpsfake.* +%doc %{_mandir}/man?/gpscat.* +%doc %{_mandir}/man?/libgps*.* +%doc %{_mandir}/man?/rtcmdecode.* +%doc %{_mandir}/man?/gpsflash.* +%doc %{_mandir}/man?/rtcm-104.* +%doc %{_mandir}/man?/srec.* %{_bindir}/gpsfake %{_bindir}/rtcmdecode %{_bindir}/gpsflash @@ -171,36 +207,45 @@ install -m 755 gps.py %{buildroot}%{py_sitedir} %{_includedir}/gps.h %{_includedir}/libgpsmm.h %{_includedir}/gpsd.h -%{_mandir}/man?/gpsfake.* -%{_mandir}/man?/gpscat.* -%{_mandir}/man?/gpspipe.* -%{_mandir}/man?/libgps*.* -%{_mandir}/man?/rtcmdecode.* -%{_mandir}/man?/gpsflash.* -%{_mandir}/man?/rtcm-104.* -%{_mandir}/man?/srec.* %{py_sitedir}/gpsfake.py* %{py_sitedir}/gpspacket.so* %{_libdir}/libgps.so -%{_libdir}/libgps.la -%{_libdir}/libgps.a %{_libdir}/pkgconfig/libgps*.pc -%files -n gpsd-clients +%files clients %defattr(-,root,root) +%doc %{_mandir}/man?/gps.* +%doc %{_mandir}/man?/cgps.* +%doc %{_mandir}/man?/xgps.* +%doc %{_mandir}/man?/xgpsspeed.* +%doc %{_mandir}/man?/gpspipe.* +%doc %{_mandir}/man?/cgpxlogger.* %{_bindir}/xgps %{_bindir}/xgpsspeed %{_bindir}/cgps %{_bindir}/cgpxlogger %{_bindir}/gpspipe -%{_mandir}/man?/gps.* -%{_mandir}/man?/cgps.* -%{_mandir}/man?/xgps.* -%{_mandir}/man?/xgpsspeed.* -%{_mandir}/man?/gpspipe.* -%{_mandir}/man?/cgpxlogger.* +%{_bindir}/gpxlogger +%{_datadir}/applications/*.desktop +%{_datadir}/pixmaps/*.xpm %changelog +* Sat Mar 22 2008 lrupp@suse.de +- update to 2.37 + Fixes: + + C++ bindings + + Garmin USB support + + multiple instances of ntp pps thread starting + + better handling of odd PPS signals + + eye candy in the php visualizers +- enable Garmin Simple Text support +- enable True North Technologies support +- disable static +- mark man files as %%doc +- added desktop entries +- fix ldconfig calls +- clean buildroot +- PreReq coreutils and fillup_prereq for postinstall * Fri Jan 18 2008 jreuter@suse.de - updated to 2.36 * Integrated Garmin Simple Text Protocol driver from Peter Slansky. diff --git a/gpsd.xpm b/gpsd.xpm new file mode 100644 index 0000000..450796f --- /dev/null +++ b/gpsd.xpm @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5800f770af55c42163f20094ee35b873126a8976a929571ae9f14f23a788b9b0 +size 31165 diff --git a/xgps.desktop b/xgps.desktop new file mode 100644 index 0000000..b399f93 --- /dev/null +++ b/xgps.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=xgps +GenericName=GPS information +Comment=Display GPS information from a gpsd daemon +Exec=xgps +Icon=gpsd +Terminal=false +Type=Application +Categories=System;Monitor; diff --git a/xgpsspeed.desktop b/xgpsspeed.desktop new file mode 100644 index 0000000..fdffca3 --- /dev/null +++ b/xgpsspeed.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=xgpsspeed +GenericName=GPS speedometer +Comment=Display GPS speed from a gpsd daemon +Exec=xgpsspeed +Icon=gpsd +Terminal=false +Type=Application +Categories=System;Monitor;