packages: gpsd/gpsd.spec, gpsd/gpsd-link.patch (NEW) - rel 1; builds

[arekm]

Author: arekm                        Date: Thu Jul  8 18:23:39 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 1; builds

---- Files affected:
packages/gpsd:
   gpsd.spec (1.22 -> 1.23) , gpsd-link.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gpsd/gpsd.spec
diff -u packages/gpsd/gpsd.spec:1.22 packages/gpsd/gpsd.spec:1.23
--- packages/gpsd/gpsd.spec:1.22	Wed May 26 16:49:53 2010
+++ packages/gpsd/gpsd.spec	Thu Jul  8 20:23:33 2010
@@ -11,11 +11,12 @@
 Summary(pl.UTF-8):	Oprogramowanie komunikujące się z GPS-em
 Name:		gpsd
 Version:	2.94
-Release:	0.1
+Release:	1
 License:	BSD
 Group:		Daemons
 Source0:	http://download.berlios.de/gpsd/%{name}-%{version}.tar.gz
 # Source0-md5:	ce70bcd707ac1df861d4c72f503c09d1
+Patch0:		%{name}-link.patch
 URL:		http://gpsd.berlios.de/
 %if %{with dbus}
 BuildRequires:	dbus-devel
@@ -24,6 +25,7 @@
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	docbook-style-xsl
 BuildRequires:	libstdc++-devel
+BuildRequires:	libusb-devel
 BuildRequires:	libxslt-progs
 BuildRequires:	ncurses-devel
 %{?with_x:BuildRequires:	openmotif-devel}
@@ -169,9 +171,14 @@
 
 %prep
 %setup -q
+%patch0 -p1
+sed -i -e 's#/usr/lib/libusb-\*\.so#/usr/%{_lib}/libusb-*.so#g' configure*
 
 %build
-%configure CPPFLAGS="-I%{_includedir}/ncurses" \
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%configure CPPFLAGS="-I%{_includedir}/ncurses $(pkg-config --cflags-only-I libusb-1.0)" \
 	%{?with_dbus:--enable-dbus} \
 	%{!?with_x:--without-x}
 
@@ -191,7 +198,6 @@
 install dgpsip-servers $RPM_BUILD_ROOT%{_datadir}/gpsd/dgpsip-servers
 
 %if %{with x}
-install -D xgps.ad $RPM_BUILD_ROOT%{_appdefsdir}/xgps
 install -D xgpsspeed.ad $RPM_BUILD_ROOT%{_appdefsdir}/xgpsspeed
 %endif
 
@@ -230,6 +236,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gpsdecode
 %attr(755,root,root) %{_libdir}/libgps.so
+%attr(755,root,root) %{_libdir}/libgpsd.so
 %{_libdir}/libgps.la
 %{_libdir}/libgpsd.la
 %{_includedir}/gps.h
@@ -283,8 +290,8 @@
 %attr(755,root,root) %{_bindir}/lcdgps
 %attr(755,root,root) %{_bindir}/xgps
 %attr(755,root,root) %{_bindir}/xgpsspeed
-%{_appdefsdir}/xgps
 %{_appdefsdir}/xgpsspeed
+%{_mandir}/man1/lcdgps.1*
 %{_mandir}/man1/xgps.1*
 %{_mandir}/man1/xgpsspeed.1*
 %endif
@@ -295,6 +302,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2010/07/08 18:23:33  arekm
+- rel 1; builds
+
 Revision 1.22  2010/05/26 14:49:53  caleb
 - Up to 2.94
 - BR: docbook-style-xsl

================================================================
Index: packages/gpsd/gpsd-link.patch
diff -u /dev/null packages/gpsd/gpsd-link.patch:1.1
--- /dev/null	Thu Jul  8 20:23:39 2010
+++ packages/gpsd/gpsd-link.patch	Thu Jul  8 20:23:33 2010
@@ -0,0 +1,11 @@
+--- gpsd-2.94/configure.ac~	2010-07-08 20:16:16.848861269 +0200
++++ gpsd-2.94/configure.ac	2010-07-08 20:17:38.965519312 +0200
+@@ -352,7 +352,7 @@
+ 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_LIB(ncurses, initscr, NCURSES_LIBS="-lncurses")
++AC_CHECK_LIB(ncurses, initscr, NCURSES_LIBS="-lncurses -ltinfo")
+ AC_SUBST(NCURSES_LIBS)
+ if test x"$NCURSES_LIBS" = x"" ; then
+   AC_MSG_WARN([Not including curses support])
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gpsd/gpsd.spec?r1=1.22&r2=1.23&f=u