From d4d88e2aeb39f57325558229ce5bf55363d81a994ab8fa07f8e1e27107b25ebf Mon Sep 17 00:00:00 2001
From: Dirk Stoecker <opensuse@dstoecker.de>
Date: Mon, 15 Feb 2010 10:16:46 +0000
Subject: [PATCH] Accepting request 32424 from home:jreuter:Application:Geo

Copy from home:jreuter:Application:Geo/gpsd via accept of submit request 32424 revision 4.
Request was accepted with message:
reviewed ok.

OBS-URL: https://build.opensuse.org/request/show/32424
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gpsd?expand=0&rev=53
---
 gpsd.changes |  6 ++++++
 gpsd.spec    | 20 ++++++++++----------
 rules.gpsd   |  1 +
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/gpsd.changes b/gpsd.changes
index a692ccf..ae8b8cc 100644
--- a/gpsd.changes
+++ b/gpsd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb 12 16:03:58 UTC 2010 - jreuter@novell.com
+
+- Add missing dependency to python-curses for devel package (bnc#574584)
+- Add another Cyprus GPS USB id (bnc#574584)
+
 -------------------------------------------------------------------
 Fri Dec 18 16:22:14 UTC 2009 - seife@opensuse.org
 
diff --git a/gpsd.spec b/gpsd.spec
index 0a8c5ad..7e5c737 100644
--- a/gpsd.spec
+++ b/gpsd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gpsd (Version 2.90)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,11 +20,11 @@
 
 Name:           gpsd
 Summary:        Service daemon for mediating access to a GPS
-License:        BSD 3-clause (or similar)
+License:        BSD3c(or similar)
 Url:            http://gpsd.berlios.de/
 Group:          Hardware/Other
 Version:        2.90
-Release:        0
+Release:        1
 %define		libgps libgps19
 Requires:       udev
 PreReq:         coreutils %fillup_prereq
@@ -41,7 +41,6 @@ Source4:        gpsd.xpm
 Source5:        xgps.desktop
 Source6:        xgpsspeed.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
 %if 0%{?suse_version} > 1110
 %else
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
@@ -80,11 +79,11 @@ Authors:
     Ville Nuorvala <vnuorval@tcs.hut.fi>
 
 %package devel
-License:        BSD 3-clause (or similar)
+License:        BSD3c(or similar)
 Summary:        Client libraries in C and Python for talking to a running gpsd or GPS
 Group:          Development/Libraries
 Requires:       %name = %version
-Requires:       pkgconfig
+Requires:       pkgconfig, python-curses
 
 %description devel
 This package provides C header files for the gpsd shared libraries that
@@ -105,8 +104,8 @@ Authors:
     Ville Nuorvala <vnuorval@tcs.hut.fi>
 
 
-%package -n %libgps
-License:        BSD 3-clause (or similar)
+%package -n libgps19
+License:        BSD3c(or similar)
 Summary:        Shared library for GPS applications
 Group:          Development/Libraries/Python
 
@@ -128,7 +127,7 @@ Authors:
 
 
 %package -n python-gpsd
-License:        BSD 3-clause (or similar)
+License:        BSD3c(or similar)
 Summary:        Client libraries in C and Python for talking to a running gpsd or GPS
 Group:          Development/Libraries/Python
 Requires:       %name = %version
@@ -151,7 +150,7 @@ Authors:
     Ville Nuorvala <vnuorval@tcs.hut.fi>
 
 %package clients
-License:        BSD 3-clause (or similar)
+License:        BSD3c(or similar)
 Summary:        Clients for gpsd with an X interface
 Group:          Hardware/Other
 
@@ -230,6 +229,7 @@ rm -rf %{buildroot}
 %fillup_only -n gpsd
 
 %post -n %libgps -p /sbin/ldconfig
+
 %postun -n %libgps -p /sbin/ldconfig
 
 %files
diff --git a/rules.gpsd b/rules.gpsd
index db3eeee..b613fc2 100644
--- a/rules.gpsd
+++ b/rules.gpsd
@@ -12,6 +12,7 @@ KERNEL=="ttyUSB*", ATTR{idVendor}=="067b", ATTR{idProduct}=="2303", RUN="/lib/ud
 KERNEL=="ttyUSB*", ATTR{idVendor}=="0403", ATTR{idProduct}=="6001", RUN="/lib/udev/gpsd.sh"
 # "Cypress M8/CY7C64013 (DeLorme uses these)"
 KERNEL=="ttyUSB*", ATTR{idVendor}=="1163", ATTR{idProduct}=="0100", RUN="/lib/udev/gpsd.sh"
+KERNEL=="ttyUSB*", ATTR{idVendor}=="1163", ATTR{idProduct}=="0200", RUN="/lib/udev/gpsd.sh"
 # "PS-360 OEM (Microsoft GPS sold with Street and Trips 2005)"
 KERNEL=="ttyUSB*", ATTR{idVendor}=="067b", ATTR{idProduct}=="aaa0", RUN="/lib/udev/gpsd.sh"
 # SiRF Star III 20ch Gmouse GPS (a.k.a Cygnal Integrated Products, Inc.)