Accepting request 35888 from home:vuntz:branches:Application:Geo

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

OBS-URL: https://build.opensuse.org/request/show/35888
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gpsd?expand=0&rev=57

gpsd-2.90.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4f5952352f891b37733dd6e0314e757bc9fc68f51a77047ca39ef58ae3fcc0c3
-size 750200

gpsd-2.92.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4088273f648805a8a2e1dd8b9e2e424b04fb50ee58f433dda3efd1488bcf2054
+size 1076298

gpsd-fix-python-install.patch

@@ -0,0 +1,26 @@
+Index: gpsd-2.92/Makefile.am
+===================================================================
+--- gpsd-2.92.orig/Makefile.am
++++ gpsd-2.92/Makefile.am
+@@ -262,7 +262,7 @@ clean-local:
+ 
+ # Install Python modules
+ install-exec-local:
+-	$(PYTHON) setup.py install --prefix=${prefix} # --root=$(DESTDIR)
++	$(PYTHON) setup.py install --prefix=${prefix} --root=$(DESTDIR)
+ endif
+ 
+ if LIBGPSMM_ENABLE
+Index: gpsd-2.92/Makefile.in
+===================================================================
+--- gpsd-2.92.orig/Makefile.in
++++ gpsd-2.92/Makefile.in
+@@ -1971,7 +1971,7 @@ maskdump.c: gpsd.h-tail maskaudit.py
+ 
+ # Install Python modules
+ @HAVE_PYTHON_TRUE@install-exec-local:
+-@HAVE_PYTHON_TRUE@	$(PYTHON) setup.py install --prefix=${prefix} # --root=$(DESTDIR)
++@HAVE_PYTHON_TRUE@	$(PYTHON) setup.py install --prefix=${prefix} --root=$(DESTDIR)
+ 
+ @HAVE_XSLT_PROCESSOR_TRUE@.xml.1:
+ @HAVE_XSLT_PROCESSOR_TRUE@	$(MANGENERATOR) $(MANFLAGS) $(MANTARGET) $<

gpsd.changes

@@ -1,3 +1,40 @@
+-------------------------------------------------------------------
+Sat Mar 27 02:43:46 CET 2010 - vuntz@opensuse.org
+
+- Update to version 2.92:
+  + Fix a packaging error: the python library module was omitted
+    from the 2.91 tarball.
+  + Improve the json import test.
+- Changes from version 2.91:
+  + We have support for NMEA GLONASS sentences, and a regression
+    test.
+  + Clients now get a DEVICE notification on every driver switch.
+  + It is possible to specify a TCP/IP AIS feed such as AISHub as a
+    data source.
+  + Serious bitrot in the NTRIP support has been fixed - it was
+    probably nonfunctional for several releases before this.
+  + Fixed buggy display of satellite-used flags in cgps.
+  + xgps is replaced by a rewrite in Python that uses pygtk,
+    eliminating a dependency on Motif; also, it now displays AIS
+    information.
+  + Uniform treatment of display-unit defaulting and -u in xgps,
+    cgps, and lcdgps.
+  + Support for AIS message types 25 and 26.
+  + Support for IPv6.
+  + A numeric instability in the earth_distance() function
+    affecting track error modeling has been fixed.
+  + Old protocol has been removed from the daemon; the library
+    still speaks it.
+- Drop openmotif, openmotif-devel BuildRequires.
+- Add xorg-x11-devel, xorg-x11-libXpm-devel BuildRequires.
+- Add gpsd-fix-python-install.patch to fix installation of the
+  python bindings.
+- Add python-gtk Requires to gpsd-clients subpackage as xgps now
+  depends on it.
+- Use a valid group for the devel subpackage.
+- Do not manually strip executables: this will be done by the build
+  service.
+
 -------------------------------------------------------------------
 Fri Feb 12 16:03:58 UTC 2010 - jreuter@novell.com
 

gpsd.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package gpsd (Version 2.90)
+# spec file for package gpsd (Version 2.92)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -23,12 +23,12 @@ Summary:        Service daemon for mediating access to a GPS
 License:        BSD3c(or similar)
 Url:            http://gpsd.berlios.de/
 Group:          Hardware/Other
-Version:        2.90
+Version:        2.92
-Release:        2
+Release:        1
 %define		libgps libgps19
 Requires:       udev
 PreReq:         coreutils %fillup_prereq
-BuildRequires:  gcc-c++ ncurses-devel openmotif openmotif-devel python-devel udev update-desktop-files xmlto
+BuildRequires:  gcc-c++ ncurses-devel python-devel udev update-desktop-files xmlto xorg-x11-devel xorg-x11-libXpm-devel
 %if 0%{?suse_version} > 1020
 BuildRequires:  dbus-1-glib-devel
 BuildRequires:  fdupes
@@ -40,10 +40,13 @@ Source3:        sysconfig.gpsd
 Source4:        gpsd.xpm
 Source5:        xgps.desktop
 Source6:        xgpsspeed.desktop
+# PATCH-FIX-UPSTREAM gpsd-fix-python-install.patch vuntz@opensuse.org -- Pass DESTDIR to setup.py (not sent upstream yet)
+Patch0:         gpsd-fix-python-install.patch
 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())")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %endif
 
 %description
@@ -81,7 +84,7 @@ Authors:
 %package devel
 License:        BSD3c(or similar)
 Summary:        Client libraries in C and Python for talking to a running gpsd or GPS
-Group:          Development/Libraries
+Group:          Development/Libraries/C and C++
 Requires:       %name = %version
 Requires:       pkgconfig, python-curses
 
@@ -153,6 +156,7 @@ Authors:
 License:        BSD3c(or similar)
 Summary:        Clients for gpsd with an X interface
 Group:          Hardware/Other
+Requires:       python-gtk
 
 %description clients
 xgps is a simple test client for gpsd with an X interface. It displays
@@ -183,6 +187,7 @@ Authors:
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static \
@@ -197,20 +202,14 @@ Authors:
 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}%{python_sitelib}
 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}%{python_sitelib}
-install -m 755 gps.py %{buildroot}%{python_sitelib}
 # remove /usr/bin/env call
-sed -i "s|/usr/bin/env python|/usr/bin/python|g" %{buildroot}%{python_sitelib}/gps.py
+sed -i "s|/usr/bin/env python|/usr/bin/python|g" %{buildroot}%{python_sitearch}/gps/gps.py
 # remove .la files
 rm -f %{buildroot}%{_libdir}/libgps.la
-strip %{buildroot}%{_bindir}/{cgps,gpsctl,gpsdecode,gpsmon,gpspipe,gpxlogger,lcdgps,xgps,xgpsspeed}
-strip %{buildroot}%{_sbindir}/gpsd
-strip %{buildroot}%{_libdir}/*so %{buildroot}%{python_sitelib}/*so
 # install desktop entries
 install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/pixmaps/%{name}.xpm
 install -m 644 %{SOURCE5} %{buildroot}%{_datadir}/applications/
@@ -270,8 +269,8 @@ rm -rf %{buildroot}
 %files -n python-gpsd
 %defattr(-,root,root)
 %{python_sitelib}/gps*.py*
-%{python_sitelib}/gpslib.so
+%{python_sitearch}/gps/
-%{python_sitelib}/gpspacket.so*
+%{python_sitearch}/gpsd-*.egg-info
 
 %files clients
 %defattr(-,root,root)
@@ -282,7 +281,6 @@ rm -rf %{buildroot}
 %{_mandir}/man?/xgpsspeed.*
 %{_mandir}/man?/gpspipe.*
 %{_mandir}/man?/gpsmon.*
-%{_mandir}/man?/cgpxlogger.*
 %{_bindir}/xgps
 %{_bindir}/xgpsspeed
 %{_bindir}/cgps