packages: gpsd/gpsd-link.patch, gpsd/gpsd.spec, gpsd/gpsd-desktop.patch (NE...

Sun Jan 16 09:21:32 CET 2011

Author: qboosh                       Date: Sun Jan 16 08:21:32 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated link patch to fix libgpsd linking (with libusb); dropped wrong skip_post_check_so
- added desktop patch, install desktops and pixmap
- moved udev files to udev-gpsd package

---- Files affected:
packages/gpsd:
   gpsd-link.patch (1.2 -> 1.3) , gpsd.spec (1.28 -> 1.29) , gpsd-desktop.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gpsd/gpsd-link.patch
diff -u packages/gpsd/gpsd-link.patch:1.2 packages/gpsd/gpsd-link.patch:1.3

--- packages/gpsd/gpsd-link.patch:1.2	Sat Jan 15 23:56:51 2011
+++ packages/gpsd/gpsd-link.patch	Sun Jan 16 09:21:26 2011
@@ -26,3 +26,14 @@
  AC_SUBST(NCURSES_LIBS)
  if test x"$NCURSES_LIBS" = x"" ; then
    AC_MSG_WARN([Not including curses support])
+--- gpsd-2.95/Makefile.am.orig	2011-01-15 19:48:42.598366646 +0100
++++ gpsd-2.95/Makefile.am	2011-01-16 07:57:57.110356589 +0100
+@@ -260,7 +260,7 @@
+ 
+ nodist_libgpsd_la_SOURCES = packet_names.h ais_json.i
+ libgps_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD)
+-libgpsd_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) $(BLUEZ_LIBS) libgps.la
++libgpsd_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) $(BLUEZ_LIBS) $(LIBUSB_LIBS) libgps.la
+ 
+ noinst_SCRIPTS =
+ 

================================================================
Index: packages/gpsd/gpsd.spec
diff -u packages/gpsd/gpsd.spec:1.28 packages/gpsd/gpsd.spec:1.29
--- packages/gpsd/gpsd.spec:1.28	Sat Jan 15 23:57:34 2011
+++ packages/gpsd/gpsd.spec	Sun Jan 16 09:21:26 2011
@@ -1,7 +1,4 @@
 # $Revision$, $Date$
-# TODO:
-#	- fix pysitedir???
-#   - ?? what the above todo means??
 #
 # Conditional build:
 %bcond_without	dbus	# build without dbus support
@@ -41,13 +38,10 @@
 BuildRequires:	rpm-pythonprov
 BuildRequires:	xmlto
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	udev-core >= 1:127
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		udevdir		/lib/udev
 
-%define		skip_post_check_so	libgpsd.so.0.0.0
-
 %description
 gpsd is a service daemon that mediates access to a GPS sensor
 connected to the host computer by serial or USB interface, making its
@@ -83,6 +77,19 @@
 spokojnie kiedy nie ma klientów i radzi sobie dobrze z odłączaniem i
 ponownym podłączaniem GPS-a.
 
+%package -n udev-gpsd
+Summary:	UDEV support for GPS hotplugging
+Summary(pl.UTF-8):	Obsługa UDEV-a do podłączania urządzeń GPS
+Group:		Applications/System
+Requires:	%{name} = %{version}-%{release}
+Requires:	udev-core >= 1:127
+
+%description -n udev-gpsd
+UDEV support for GPS hotplugging.
+
+%description -n udev-gpsd -l pl.UTF-8
+Obsługa UDEV-a do podłączania urządzeń GPS.
+
 %package libs
 Summary:	GPSd client library
 Summary(pl.UTF-8):	Biblioteka kliencka GPSd
@@ -241,6 +248,11 @@
 [ ! -f $RPM_BUILD_ROOT%{_includedir}/libQgpsmm_global.h ] || exit 1
 install libQgpsmm/libQgpsmm_global.h $RPM_BUILD_ROOT%{_includedir}
 
+[ ! -d $RPM_BUILD_ROOT%{_desktopdir} ] || exit 1
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
+install packaging/X11/{xgps,xgpsspeed}.desktop $RPM_BUILD_ROOT%{_desktopdir}
+install packaging/X11/gpsd-logo.png $RPM_BUILD_ROOT%{_pixmapsdir}
+
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_postclean
@@ -261,12 +273,15 @@
 %attr(755,root,root) %{_bindir}/gpsmon
 %{_mandir}/man8/gpsd.8*
 %{_mandir}/man1/gpsmon.1*
+%dir %{_datadir}/gpsd
+%{_datadir}/gpsd/dgpsip-servers
+
+%files -n udev-gpsd
+%defattr(644,root,root,755)
 %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
-%dir %{_datadir}/gpsd
-%{_datadir}/gpsd/dgpsip-servers
 
 %files libs
 %defattr(644,root,root,755)
@@ -314,13 +329,11 @@
 %attr(755,root,root) %{_bindir}/gpscat
 %attr(755,root,root) %{_bindir}/gpsfake
 %attr(755,root,root) %{_bindir}/gpsprof
-%{py_sitescriptdir}/gpscap.py[co]
-
 %dir %{py_sitedir}/gps
 %attr(755,root,root) %{py_sitedir}/gps/*.so
 %{py_sitedir}/gps/*.py[co]
 %{py_sitedir}/gps-%{version}-py*.egg-info
-
+%{py_sitescriptdir}/gpscap.py[co]
 %{_mandir}/man1/gpscat.1*
 %{_mandir}/man1/gpsfake.1*
 %{_mandir}/man1/gpsprof.1*
@@ -345,6 +358,9 @@
 %{_mandir}/man1/lcdgps.1*
 %{_mandir}/man1/xgps.1*
 %{_mandir}/man1/xgpsspeed.1*
+%{_desktopdir}/xgps.desktop
+%{_desktopdir}/xgpsspeed.desktop
+%{_pixmapsdir}/gpsd-logo.png
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -353,6 +369,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2011/01/16 08:21:26  qboosh
+- updated link patch to fix libgpsd linking (with libusb); dropped wrong skip_post_check_so
+- added desktop patch, install desktops and pixmap
+- moved udev files to udev-gpsd package
+
 Revision 1.28  2011/01/15 22:57:34  qboosh
 - enabled bluetooth by default
 

================================================================
Index: packages/gpsd/gpsd-desktop.patch
diff -u /dev/null packages/gpsd/gpsd-desktop.patch:1.1
--- /dev/null	Sun Jan 16 09:21:32 2011
+++ packages/gpsd/gpsd-desktop.patch	Sun Jan 16 09:21:26 2011
@@ -0,0 +1,30 @@
+--- gpsd-2.95/packaging/X11/xgps.desktop.orig	2010-07-12 02:40:22.000000000 +0200
++++ gpsd-2.95/packaging/X11/xgps.desktop	2011-01-16 08:06:29.458356589 +0100
+@@ -2,9 +2,11 @@
+ Encoding=UTF-8
+ Name=xgps
+ GenericName=GPS information
++GenericName[pl]=Informacje GPS
+ Comment=Display GPS information from a gpsd daemon
++Comment[pl]=Wyświetlanie informacji GPS od demona gpsd
+ Exec=xgps
+-Icon=/usr/share/gpsd/gpsd-logo.png
++Icon=gpsd-logo.png
+ Terminal=false
+ Type=Application
+ Categories=Application;Graphics;
+--- gpsd-2.95/packaging/X11/xgpsspeed.desktop.orig	2010-07-12 02:40:22.000000000 +0200
++++ gpsd-2.95/packaging/X11/xgpsspeed.desktop	2011-01-16 08:07:38.142361617 +0100
+@@ -2,9 +2,11 @@
+ Encoding=UTF-8
+ Name=xgpsspeed
+ GenericName=GPS speedometer
++GenericName[pl]=Prędkościomierz GPS
+ Comment=Display GPS speed from a gpsd daemon
++Comment[pl]=Wyświetlanie prędkości GPS od demona gpsd
+ Exec=xgpsspeed
+-Icon=/usr/share/gpsd/gpsd-logo.png
++Icon=gpsd-logo.png
+ Terminal=false
+ Type=Application
+ Categories=Application;Graphics;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gpsd/gpsd-link.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gpsd/gpsd.spec?r1=1.28&r2=1.29&f=u

