- updated to 2.96 (note: new libgps and libQgpsmm sonames)

- updated link patch
- removed obsolete python patch

Changed files:
    gpsd-link.patch -> 1.4
    gpsd-python.patch -> 1.2
    gpsd.spec -> 1.31

diff --git a/gpsd-link.patch b/gpsd-link.patch
index 40c4ca02f22c480758d0126a7d31f4719902ab7a..c81a4aec0e4dd58c291ef65f5b30d961521d59db 100644 (file)
--- a/gpsd-link.patch
+++ b/gpsd-link.patch
@@ -1,8 +1,8 @@
---- gpsd-2.95/configure.ac~    2010-07-08 20:16:16.848861269 +0200
-+++ gpsd-2.95/configure.ac     2010-07-08 20:17:38.965519312 +0200
-@@ -227,13 +227,13 @@
-          [Define if you have the external 'daylight' variable.])
- fi
+--- gpsd-2.96/configure.ac.orig        2011-03-22 00:20:02.000000000 +0100
++++ gpsd-2.96/configure.ac     2011-03-24 21:03:08.032911291 +0100
+@@ -151,13 +151,13 @@
+ AC_HEADER_TIME
+ AC_STRUCT_TIMEZONE
  
 -AC_CHECK_LIB(nsl, gethostbyname, LIBNSL="-lnsl")
 +AC_CHECK_FUNC([gethostbyname], , [AC_CHECK_LIB(nsl, gethostbyname, LIBNSL="-lnsl")])
@@ -17,23 +17,23 @@
  AC_SUBST(LIBC)
  AC_CHECK_LIB(pthread, pthread_setcancelstate,
        [LIBPTHREAD="-lpthread"
-@@ -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)
+@@ -198,7 +198,7 @@
+ 
+ dnl Check for curses headers and libraries.  The presence of the
+ dnl library is used to decide whether or not to build some programs.
 -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])
---- 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 @@
+--- gpsd-2.96/Makefile.am.orig 2011-03-15 04:34:31.000000000 +0100
++++ gpsd-2.96/Makefile.am      2011-03-24 21:02:52.688910453 +0100
+@@ -272,7 +272,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
+-libgpsd_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) $(BLUEZ_LIBS) $(LIBRT) libgps.la
++libgpsd_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) $(BLUEZ_LIBS) $(LIBUSB_LIBS) $(LIBRT) libgps.la
  
  noinst_SCRIPTS =
  

diff --git a/gpsd-python.patch b/gpsd-python.patch
deleted file mode 100644 (file)
index d959e09..0000000
--- a/gpsd-python.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gpsd-2.95/Makefile.am.orig 2010-07-12 02:40:22.000000000 +0200
-+++ gpsd-2.95/Makefile.am      2011-01-15 19:00:45.278364132 +0100
-@@ -375,9 +375,9 @@
- # when DESTDIR is not defined as distutils would use the current
- # working directory as root directory and not install to ${prefix}.
-       if test -z "$(DESTDIR)"; then \
--              $(PYTHON) setup.py install --prefix=${prefix} ;\
-+              MAKE='$(MAKE)' MAKEFLAGS='' $(PYTHON) setup.py install --prefix=${prefix} ;\
-       else \
--              $(PYTHON) setup.py install --prefix=${prefix} --root=$(DESTDIR) ;\
-+              MAKE='$(MAKE)' MAKEFLAGS='' $(PYTHON) setup.py install --prefix=${prefix} --root=$(DESTDIR) ;\
-       fi
- endif
- if LIB_Q_GPSMM_ENABLE

diff --git a/gpsd.spec b/gpsd.spec
index 94ad3a00225480e6e7a05ac9f6af829bb147565c..b4f12697cbab9c4944ab8aac16fbb1b56aee9bb6 100644 (file)
--- a/gpsd.spec
+++ b/gpsd.spec
@@ -7,14 +7,13 @@
 Summary:       Service daemon for mediating access to a GPS
 Summary(pl.UTF-8):     Oprogramowanie komunikujące się z GPS-em
 Name:          gpsd
-Version:       2.95
-Release:       3
+Version:       2.96
+Release:       1
 License:       BSD
 Group:         Daemons
 Source0:       http://download.berlios.de/gpsd/%{name}-%{version}.tar.gz
-# Source0-md5: 12535a9ed9fecf9ea2c5bdc9840da5ae
+# Source0-md5: 26a7a04d4298bc3a3a5d89fef4582b64
 Patch0:                %{name}-link.patch
-Patch1:                %{name}-python.patch
 URL:           http://gpsd.berlios.de/
 BuildRequires: QtNetwork-devel >= 4.4
 BuildRequires: autoconf >= 2.50
@@ -214,7 +213,6 @@ xgpsspeed to prędkościomierz używający informacji o położeniu z GPS-a.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -287,7 +285,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libgpsd.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgpsd.so.0
 %attr(755,root,root) %{_libdir}/libgps.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgps.so.19
+%attr(755,root,root) %ghost %{_libdir}/libgps.so.20
 
 %files devel
 %defattr(644,root,root,755)
@@ -305,7 +303,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/libgps.3*
 %{_mandir}/man3/libgpsd.3*
 %{_mandir}/man3/libgpsmm.3*
-%{_mandir}/man5/rtcm-104.5*
 %{_mandir}/man5/srec.5*
 
 %files static
@@ -316,12 +313,14 @@ rm -rf $RPM_BUILD_ROOT
 %files qt-libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQgpsmm.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libQgpsmm.so.19
+%attr(755,root,root) %ghost %{_libdir}/libQgpsmm.so.20
 
 %files qt-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQgpsmm.so
+%{_libdir}/libQgpsmm.prl
 %{_includedir}/libQgpsmm_global.h
+%{_pkgconfigdir}/Qgpsmm.pc
 
 %files -n python-gps
 %defattr(644,root,root,755)
@@ -332,7 +331,7 @@ rm -rf $RPM_BUILD_ROOT
 %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]
+%{py_sitedir}/gpscap.py[co]
 %{_mandir}/man1/gpscat.1*
 %{_mandir}/man1/gpsfake.1*
 %{_mandir}/man1/gpsprof.1*