From 238ab070cc7731032fa93110d3dfc93de5aa6bfc Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 31 Mar 2009 15:48:00 +0000 Subject: [PATCH] install gpsdclient.h, viking needs it --- gpsd-2.39-install-gpsdclient-header.patch | 32 +++++++++++++++++++++++ gpsd.spec | 11 ++++++-- 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 gpsd-2.39-install-gpsdclient-header.patch diff --git a/gpsd-2.39-install-gpsdclient-header.patch b/gpsd-2.39-install-gpsdclient-header.patch new file mode 100644 index 0000000..0240ff0 --- /dev/null +++ b/gpsd-2.39-install-gpsdclient-header.patch @@ -0,0 +1,32 @@ +diff -up gpsd-2.39/Makefile.am.BAD gpsd-2.39/Makefile.am +--- gpsd-2.39/Makefile.am.BAD 2009-03-31 11:34:18.000000000 -0400 ++++ gpsd-2.39/Makefile.am 2009-03-31 11:34:30.000000000 -0400 +@@ -318,10 +318,10 @@ CLEANFILES += stamp-gps-manpages stamp-g + endif + + noinst_HEADERS = driver_italk.h driver_rtcm2.h driver_superstar2.h \ +- driver_ubx.h gpsmon.h gpsdclient.h ++ driver_ubx.h gpsmon.h + + nodist_include_HEADERS = gpsd.h +-include_HEADERS = gps.h libgpsmm.h ++include_HEADERS = gps.h gpsdclient.h libgpsmm.h + + EXTRA_DIST = \ + autogen.sh \ +diff -up gpsd-2.39/Makefile.in.BAD gpsd-2.39/Makefile.in +--- gpsd-2.39/Makefile.in.BAD 2009-03-31 11:34:40.000000000 -0400 ++++ gpsd-2.39/Makefile.in 2009-03-31 11:34:51.000000000 -0400 +@@ -632,10 +632,10 @@ man_MANS = \ + # + @HAVE_XSLT_PROCESSOR_TRUE@BUILT_MANPAGES = $(MANPAGES_DIST) + noinst_HEADERS = driver_italk.h driver_rtcm2.h driver_superstar2.h \ +- driver_ubx.h gpsmon.h gpsdclient.h ++ driver_ubx.h gpsmon.h + + nodist_include_HEADERS = gpsd.h +-include_HEADERS = gps.h libgpsmm.h ++include_HEADERS = gps.h gpsdclient.h libgpsmm.h + EXTRA_DIST = \ + autogen.sh \ + README \ diff --git a/gpsd.spec b/gpsd.spec index 754697b..96c69e7 100644 --- a/gpsd.spec +++ b/gpsd.spec @@ -2,7 +2,7 @@ Name: gpsd Version: 2.39 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Service daemon for mediating access to a GPS Group: System Environment/Daemons @@ -17,6 +17,8 @@ Source11: gpsd.sysconfig Source21: gpsd.hotplug.wrapper Patch0: python-pyexecdir-install-gpsd-2.38.patch Patch1: parallel-make-dependencies.patch +# Viking needs this header file to be able to build +Patch2: gpsd-2.39-install-gpsdclient-header.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel dbus-glib-devel ncurses-devel xmlto python-devel @@ -72,7 +74,7 @@ can run on a serial terminal or terminal emulator. %setup -q %patch0 -p1 %patch1 -p1 - +%patch2 -p1 %build %configure \ @@ -190,6 +192,7 @@ fi %{_includedir}/gps.h %{_includedir}/libgpsmm.h %{_includedir}/gpsd.h +%{_includedir}/gpsdclient.h %{_mandir}/man1/gpsfake.1* %{_mandir}/man1/gpsflash.1* %{_mandir}/man3/libgps.3* @@ -226,6 +229,10 @@ fi %changelog +* Tue Mar 31 2009 Tom "spot" Callaway - 2.39-3 +- some of the gpsd client bits went into gpsdclient.h, but that file wasn't getting installed + specifically, viking needs that header to build. + * Wed Mar 25 2009 Douglas E. Warner - 2.39-2 - adding patch to try to fix parallel make errors