- ver. 2.92

- ncurses patch replaced with CPPFLAGS switch
- udev merged with the sources

Changed files:
    gpsd-ncurses.patch -> 1.5
    gpsd-udev.patch -> 1.2
    gpsd.spec -> 1.20

diff --git a/gpsd-ncurses.patch b/gpsd-ncurses.patch
deleted file mode 100644 (file)
index 0c07ffc..0000000
--- a/gpsd-ncurses.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -ur gpsd-2.39/cgps.c gpsd-2.39.new/cgps.c
---- gpsd-2.39/cgps.c   2009-03-18 17:44:54.000000000 +0100
-+++ gpsd-2.39.new/cgps.c       2009-06-08 13:39:54.140175509 +0200
-@@ -98,11 +98,7 @@
- #include <signal.h>
- 
- #include "gpsd_config.h"
--#ifdef HAVE_NCURSES_H
--#include <ncurses.h>
--#else
--#include <curses.h>
--#endif /* HAVE_NCURSES_H */
-+#include <ncurses/ncurses.h>
- 
- #include "gps.h"
- #include "gpsdclient.h"
-Tylko w gpsd-2.39.new/: cgps.c~
-diff -ur gpsd-2.39/configure.ac gpsd-2.39.new/configure.ac
---- gpsd-2.39/configure.ac     2009-03-18 22:09:27.000000000 +0100
-+++ gpsd-2.39.new/configure.ac 2009-06-08 13:40:34.023615525 +0200
-@@ -327,7 +327,7 @@
- dnl TODO: give an example of what system uses curses.h with
- dnl libncurses.  We define our own variables to reduce the risk of
- dnl breaking if autoconf changes (private) variable names.
--AC_CHECK_HEADERS(ncurses.h)
-+AC_CHECK_HEADERS(ncurses/ncurses.h)
- AC_CHECK_LIB(ncurses, initscr, NCURSES_LIBS="-lncurses")
- AC_SUBST(NCURSES_LIBS)
- if test x"$NCURSES_LIBS" = x"" ; then
-Tylko w gpsd-2.39.new/: configure.ac~
-diff -ur gpsd-2.39/gpsmon.c gpsd-2.39.new/gpsmon.c
---- gpsd-2.39/gpsmon.c 2009-03-18 18:37:56.000000000 +0100
-+++ gpsd-2.39.new/gpsmon.c     2009-06-08 13:42:31.817981645 +0200
-@@ -27,11 +27,7 @@
- #include <sys/ioctl.h>        /* for O_RDWR */
- 
- #include "gpsd_config.h"
--#ifdef HAVE_NCURSES_H
--#include <ncurses.h>
--#else
--#include <curses.h>
--#endif /* HAVE_NCURSES_H */
-+#include <ncurses/ncurses.h>
- #include "gpsd.h"
- 
- #include "bits.h"
-Tylko w gpsd-2.39.new/: gpsmon.c~
-diff -ur gpsd-2.39/monitor_italk.c gpsd-2.39.new/monitor_italk.c
---- gpsd-2.39/monitor_italk.c  2009-03-06 21:15:24.000000000 +0100
-+++ gpsd-2.39.new/monitor_italk.c      2009-06-08 13:42:26.533324558 +0200
-@@ -12,11 +12,7 @@
- #include <assert.h>
- 
- #include "gpsd_config.h"
--#ifdef HAVE_NCURSES_H
--#include <ncurses.h>
--#else
--#include <curses.h>
--#endif /* HAVE_NCURSES_H */
-+#include <ncurses/ncurses.h>
- #include "gpsd.h"
- 
- #include "bits.h"
-Tylko w gpsd-2.39.new/: monitor_italk.c~
-diff -ur gpsd-2.39/monitor_nmea.c gpsd-2.39.new/monitor_nmea.c
---- gpsd-2.39/monitor_nmea.c   2009-03-06 15:53:41.000000000 +0100
-+++ gpsd-2.39.new/monitor_nmea.c       2009-06-08 13:42:46.875150797 +0200
-@@ -18,11 +18,7 @@
- #include <assert.h>
- 
- #include "gpsd_config.h"
--#ifdef HAVE_NCURSES_H
--#include <ncurses.h>
--#else
--#include <curses.h>
--#endif /* HAVE_NCURSES_H */
-+#include <ncurses/ncurses.h>
- #include "gpsd.h"
- 
- #include "bits.h"
-Tylko w gpsd-2.39.new/: monitor_nmea.c~
-diff -ur gpsd-2.39/monitor_proto.c gpsd-2.39.new/monitor_proto.c
---- gpsd-2.39/monitor_proto.c  2009-03-03 14:17:16.000000000 +0100
-+++ gpsd-2.39.new/monitor_proto.c      2009-06-08 13:43:01.449954577 +0200
-@@ -15,11 +15,7 @@
- #include <assert.h>
- 
- #include "gpsd_config.h"
--#ifdef HAVE_NCURSES_H
--#include <ncurses.h>
--#else
--#include <curses.h>
--#endif /* HAVE_NCURSES_H */
-+#include <ncurses/ncurses.h>
- #include "gpsd.h"
- 
- #include "bits.h"
-Tylko w gpsd-2.39.new/: monitor_proto.c~
-diff -ur gpsd-2.39/monitor_sirf.c gpsd-2.39.new/monitor_sirf.c
---- gpsd-2.39/monitor_sirf.c   2009-03-06 15:53:41.000000000 +0100
-+++ gpsd-2.39.new/monitor_sirf.c       2009-06-08 13:43:14.793316927 +0200
-@@ -16,11 +16,7 @@
- #include <assert.h>
- 
- #include "gpsd_config.h"
--#ifdef HAVE_NCURSES_H
--#include <ncurses.h>
--#else
--#include <curses.h>
--#endif /* HAVE_NCURSES_H */
-+#include <ncurses/ncurses.h>
- #include "gpsd.h"
- 
- #include "bits.h"
-Tylko w gpsd-2.39.new/: monitor_sirf.c~
-diff -ur gpsd-2.39/monitor_superstar2.c gpsd-2.39.new/monitor_superstar2.c
---- gpsd-2.39/monitor_superstar2.c     2009-03-06 21:15:24.000000000 +0100
-+++ gpsd-2.39.new/monitor_superstar2.c 2009-06-08 13:43:29.506723380 +0200
-@@ -12,11 +12,7 @@
- #include <assert.h>
- 
- #include "gpsd_config.h"
--#ifdef HAVE_NCURSES_H
--#include <ncurses.h>
--#else
--#include <curses.h>
--#endif /* HAVE_NCURSES_H */
-+#include <ncurses/ncurses.h>
- #include "gpsd.h"
- 
- #include "bits.h"
-Tylko w gpsd-2.39.new/: monitor_superstar2.c~
-diff -ur gpsd-2.39/monitor_ubx.c gpsd-2.39.new/monitor_ubx.c
---- gpsd-2.39/monitor_ubx.c    2009-03-12 13:52:21.000000000 +0100
-+++ gpsd-2.39.new/monitor_ubx.c        2009-06-08 13:43:41.975022652 +0200
-@@ -12,11 +12,7 @@
- #include <assert.h>
- 
- #include "gpsd_config.h"
--#ifdef HAVE_NCURSES_H
--#include <ncurses.h>
--#else
--#include <curses.h>
--#endif /* HAVE_NCURSES_H */
-+#include <ncurses/ncurses.h>
- #include "gpsd.h"
- 
- #include "bits.h"
-Tylko w gpsd-2.39.new/: monitor_ubx.c~

diff --git a/gpsd-udev.patch b/gpsd-udev.patch
deleted file mode 100644 (file)
index 93cbba0..0000000
--- a/gpsd-udev.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -NurpP --minimal gpsd-2.37.orig/gpsd.hotplug gpsd-2.37/gpsd.hotplug
---- gpsd-2.37.orig/gpsd.hotplug        2007-06-26 20:54:32.000000000 +0200
-+++ gpsd-2.37/gpsd.hotplug     2008-09-15 22:16:07.785330941 +0200
-@@ -7,7 +7,7 @@
- import sys, time, os, syslog, glob, socket, stat
- 
- CONTROL_SOCKET = "/var/run/gpsd.sock"
--WHEREAMI = "/etc/hotplug/usb/gpsd.hotplug"
-+WHEREAMI = "/lib/udev/gpsd.hotplug"
- 
- def gpsd_control_connect():
-     "Acquire a connection to the GPSD control socket."
-diff -NurpP --minimal gpsd-2.37.orig/gpsd.hotplug.wrapper gpsd-2.37/gpsd.hotplug.wrapper
---- gpsd-2.37.orig/gpsd.hotplug.wrapper        1970-01-01 01:00:00.000000000 +0100
-+++ gpsd-2.37/gpsd.hotplug.wrapper     2008-09-15 22:13:04.628685277 +0200
-@@ -0,0 +1,22 @@
-+#! /bin/sh
-+# $Id$
-+
-+#debian addition with a pld twist:
-+[ ! -r /etc/sysconfig/gpsd ] || . /etc/sysconfig/gpsd
-+[ "$START_DAEMON" = "yes" ] || exit 0
-+[ "$USBAUTO" = "yes" ] || exit 0
-+
-+
-+if [ "$ACTION" == "remove" ] ; then
-+  if [ $(echo $DEVLINKS | grep -q /dev/gps) ] ; then
-+    exec /lib/udev/gpsd.hotplug "$ACTION" "$DEVNAME"
-+  fi
-+  exit 0
-+fi
-+
-+. /lib/udev/hotplug.functions
-+
-+# wait for /usr & /var to be mounted
-+wait_for_file /usr/bin/python && \
-+wait_for_file /var/run && \
-+  exec /lib/udev/gpsd.hotplug "$ACTION" "$DEVNAME"
-diff -NurpP --minimal gpsd-2.37.orig/gpsd.udev gpsd-2.37/gpsd.udev
---- gpsd-2.37.orig/gpsd.udev   1970-01-01 01:00:00.000000000 +0100
-+++ gpsd-2.37/gpsd.udev        2008-09-15 22:11:55.875772637 +0200
-@@ -0,0 +1,39 @@
-+# udev rules for gpsd
-+# $Id$
-+#
-+# GPSes don't have their own USB device class.  They're serial-over-USB
-+# devices, so what you see is actually the ID of the serial-over-USB chip.
-+# Fortunately, just two of these account for over 80% of consumer-grade
-+# GPS sensors.  The gpsd.hotplug.wrapper script will tell a running gpsd
-+# that it should look at the device that just went active, because it
-+# might be a GPS.
-+#
-+# The following setup works on Debian - something similar will apply on
-+# other distributions:
-+#
-+#   /etc/udev/gpsd.rules
-+#   /etc/udev/rules.d/025_gpsd.rules -> ../gpsd.rules
-+#   /lib/udev/gpsd.hotplug.wrapper
-+#   /lib/udev/gpsd.hotplug
-+#
-+# Setting the link in /etc/udev/rules.d activates the rule and determines
-+# when to run it on boot (similar to init.d processing).
-+
-+SUBSYSTEM!="tty", GOTO="gpsd_rules_end"
-+
-+# Prolific Technology, Inc. PL2303 Serial Port
-+SYSFS{idVendor}=="067b", SYSFS{idProduct}=="2303", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
-+# ATEN International Co., Ltd UC-232A Serial Port [pl2303]
-+SYSFS{idVendor}=="0557", SYSFS{idProduct}=="2008", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
-+# FTDI 8U232AM
-+SYSFS{idVendor}=="0403", SYSFS{idProduct}=="6001", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
-+# Cypress M8/CY7C64013 (DeLorme uses these)
-+SYSFS{idVendor}=="1163", SYSFS{idProduct}=="0100", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
-+# PS-360 OEM (Microsoft GPS sold with Street and Trips 2005)
-+SYSFS{idVendor}=="067b", SYSFS{idProduct}=="aaa0", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
-+# Garmin International GPSmap, various models (tested with Garmin GPS 18 USB)
-+SYSFS{idVendor}=="091e", SYSFS{idProduct}=="0003", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
-+
-+ACTION=="remove", RUN+="/lib/udev/gpsd.hotplug.wrapper"
-+
-+LABEL="gpsd_rules_end"
---- gpsd-2.37.orig/gpsd.sysconfig      1970-01-01 01:00:00.000000000 +0100
-+++ gpsd-2.37/gpsd.sysconfig   2008-09-15 23:34:54.671941394 +0200
-@@ -0,0 +1,4 @@
-+START_DAEMON="yes"
-+DAEMON_OPTS=""
-+DEVICES=""
-+USBAUTO="yes"

diff --git a/gpsd.spec b/gpsd.spec
index 4d76cc4f869b9503379cef8d66d7bf05fdb76f81..c150005766ed7cd64b47fa7eeddfce1f75bb41c5 100644 (file)
--- a/gpsd.spec
+++ b/gpsd.spec
@@ -9,17 +9,13 @@
 Summary:       Service daemon for mediating access to a GPS
 Summary(pl.UTF-8):     Oprogramowanie komunikujące się z GPS-em
 Name:          gpsd
-Version:       2.39
-Release:       3
+Version:       2.92
+Release:       0.1
 License:       BSD
 Group:         Daemons
 Source0:       http://download.berlios.de/gpsd/%{name}-%{version}.tar.gz
-# Source0-md5: 3db437196a6840c252fca99b6c19d4d0
-Patch0:                %{name}-ncurses.patch
-Patch1:                %{name}-udev.patch
+# Source0-md5: 50b60d9f6dd51e001f4dfbaeb825c988
 URL:           http://gpsd.berlios.de/
-BuildRequires: autoconf
-BuildRequires: automake
 %if %{with dbus}
 BuildRequires: dbus-devel
 BuildRequires: dbus-glib-devel
@@ -168,16 +164,9 @@ xgpsspeed to prędkościomierz używający informacji o położeniu z GPS-a.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
+%configure CPPFLAGS="-I%{_includedir}/ncurses" \
        %{?with_dbus:--enable-dbus} \
        %{!?with_x:--without-x}
 
@@ -192,8 +181,8 @@ install -d $RPM_BUILD_ROOT{%{udevdir},/etc/{udev/rules.d,sysconfig}}
        DESTDIR=$RPM_BUILD_ROOT
 
 install gpsd.hotplug gpsd.hotplug.wrapper $RPM_BUILD_ROOT%{udevdir}
-install        gpsd.udev $RPM_BUILD_ROOT/etc/udev/rules.d/25-gpsd.rules
-install        gpsd.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/gpsd
+#install       gpsd.udev $RPM_BUILD_ROOT/etc/udev/rules.d/25-gpsd.rules
+#install       gpsd.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/gpsd
 install dgpsip-servers $RPM_BUILD_ROOT%{_datadir}/gpsd/dgpsip-servers
 
 %if %{with x}
@@ -201,8 +190,8 @@ install -D xgps.ad $RPM_BUILD_ROOT%{_appdefsdir}/xgps
 install -D xgpsspeed.ad $RPM_BUILD_ROOT%{_appdefsdir}/xgpsspeed
 %endif
 
-mv $RPM_BUILD_ROOT%{py_sitescriptdir}/*.so $RPM_BUILD_ROOT%{py_sitedir}
-
+%py_comp $RPM_BUILD_ROOT%{py_sitedir}
+%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_postclean
 
 %clean
@@ -220,19 +209,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/gpsmon.1*
 %attr(755,root,root) %{udevdir}/gpsd.hotplug
 %attr(755,root,root) %{udevdir}/gpsd.hotplug.wrapper
-/etc/udev/rules.d/25-gpsd.rules
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/gpsd
+#/etc/udev/rules.d/25-gpsd.rules
+#%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/gpsd
 %dir %{_datadir}/%{name}
 %{_datadir}/gpsd/dgpsip-servers
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgps.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgps.so.18
+%attr(755,root,root) %ghost %{_libdir}/libgps.so.19
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/gpsflash
 %attr(755,root,root) %{_bindir}/gpsdecode
 %attr(755,root,root) %{_libdir}/libgps.so
 %{_libdir}/libgps.la
@@ -241,7 +229,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libgpsmm.h
 %{_pkgconfigdir}/libgps.pc
 %{_pkgconfigdir}/libgpsd.pc
-%{_mandir}/man1/gpsflash.1*
 %{_mandir}/man1/gpsdecode.1*
 %{_mandir}/man3/libgps.3*
 %{_mandir}/man3/libgpsd.3*
@@ -258,11 +245,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/gpscat
 %attr(755,root,root) %{_bindir}/gpsfake
 %attr(755,root,root) %{_bindir}/gpsprof
-%{py_sitescriptdir}/gps.py[co]
 %{py_sitescriptdir}/gpscap.py[co]
-%{py_sitescriptdir}/gpsfake.py[co]
-%attr(755,root,root) %{py_sitedir}/gpslib.so
-%attr(755,root,root) %{py_sitedir}/gpspacket.so
+
+%dir %{py_sitedir}/gps
+%attr(755,root,root) %{py_sitedir}/gps/*.so
+%{py_sitedir}/gps/*.py[co]
+%{py_sitedir}/*.egg*
+
 %{_mandir}/man1/gpscat.1*
 %{_mandir}/man1/gpsfake.1*
 %{_mandir}/man1/gpsprof.1*
@@ -275,7 +264,7 @@ rm -rf $RPM_BUILD_ROOT
 %{?with_dbus:%attr(755,root,root) %{_bindir}/gpxlogger}
 %{_mandir}/man1/gpsctl.1*
 %{_mandir}/man1/cgps.1*
-%{_mandir}/man1/cgpxlogger.1*
+#%{_mandir}/man1/cgpxlogger.1*
 %{_mandir}/man1/gps.1*
 %{_mandir}/man1/gpspipe.1*