[packages/gpsd] - updated to 3.10 (note: new sonames) - updated link patch, added destdir patch

[qboosh]

commit b7bddaefa2cdb83b5645164c4152406d8cc7d3ba
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Nov 24 18:05:07 2013 +0100

    - updated to 3.10 (note: new sonames)
    - updated link patch, added destdir patch

 gpsd-destdir.patch | 17 +++++++++++++++++
 gpsd-link.patch    | 30 ++++++++++++------------------
 gpsd.spec          | 14 +++++++++-----
 3 files changed, 38 insertions(+), 23 deletions(-)
---
diff --git a/gpsd.spec b/gpsd.spec
index 343863c..8ddf44d 100644
--- a/gpsd.spec
+++ b/gpsd.spec
@@ -6,15 +6,16 @@
 Summary:	Service daemon for mediating access to a GPS
 Summary(pl.UTF-8):	Oprogramowanie komunikujące się z GPS-em
 Name:		gpsd
-Version:	3.9
+Version:	3.10
 Release:	1
 License:	BSD
 Group:		Daemons
 Source0:	http://download-mirror.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.gz
-# Source0-md5:	53a88f24a0973d23427e82e9a8914f19
+# Source0-md5:	fc5b03aae38b9b5b6880b31924d0ace3
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-qt.patch
 Patch2:		%{name}-desktop.patch
+Patch3:		%{name}-destdir.patch
 URL:		http://www.catb.org/gpsd/
 BuildRequires:	QtNetwork-devel >= 4.4
 %if %{with dbus}
@@ -216,6 +217,7 @@ xgpsspeed to prędkościomierz używający informacji o położeniu z GPS-a.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %scons_env \
@@ -298,9 +300,9 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgpsd.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgpsd.so.21
+%attr(755,root,root) %ghost %{_libdir}/libgpsd.so.22
 %attr(755,root,root) %{_libdir}/libgps.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgps.so.20
+%attr(755,root,root) %ghost %{_libdir}/libgps.so.21
 
 %files devel
 %defattr(644,root,root,755)
@@ -322,7 +324,7 @@ 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.20
+%attr(755,root,root) %ghost %{_libdir}/libQgpsmm.so.21
 
 %files qt-devel
 %defattr(644,root,root,755)
@@ -348,10 +350,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files clients
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/gps2udp
 %attr(755,root,root) %{_bindir}/gpsctl
 %attr(755,root,root) %{_bindir}/cgps
 %attr(755,root,root) %{_bindir}/gpspipe
 %{?with_dbus:%attr(755,root,root) %{_bindir}/gpxlogger}
+%{_mandir}/man1/gps2udp.1*
 %{_mandir}/man1/gpsctl.1*
 %{_mandir}/man1/cgps.1*
 %{_mandir}/man1/gps.1*
diff --git a/gpsd-destdir.patch b/gpsd-destdir.patch
new file mode 100644
index 0000000..c3a4376
--- /dev/null
+++ b/gpsd-destdir.patch
@@ -0,0 +1,17 @@
+--- gpsd-3.10/SConstruct.orig	2013-11-24 16:55:54.099218887 +0100
++++ gpsd-3.10/SConstruct	2013-11-24 17:05:01.072529266 +0100
+@@ -1789,10 +1789,10 @@
+ # is plugged in.
+ 
+ Utility('udev-install', 'install', [
+-    'mkdir -p ' + env['udevdir'],
+-    'cp $SRCDIR/gpsd.rules ' + env['udevdir'] + '/rules.d/25-gpsd.rules',
+-    'cp $SRCDIR/gpsd.hotplug ' + env['udevdir'],
+-    'chmod a+x ' + env['udevdir'] + '/gpsd.hotplug',
++    'mkdir -p ' + DESTDIR + env['udevdir'] + '/rules.d',
++    'cp $SRCDIR/gpsd.rules ' + DESTDIR + env['udevdir'] + '/rules.d/25-gpsd.rules',
++    'cp $SRCDIR/gpsd.hotplug ' + DESTDIR + env['udevdir'],
++    'chmod a+x ' + DESTDIR + env['udevdir'] + '/gpsd.hotplug',
+         ])
+ 
+ Utility('udev-uninstall', '', [
diff --git a/gpsd-link.patch b/gpsd-link.patch
index 49760af..6d48ea8 100644
--- a/gpsd-link.patch
+++ b/gpsd-link.patch
@@ -1,9 +1,9 @@
 --- gpsd-3.8/SConstruct.orig	2013-03-01 18:51:51.019185370 +0100
 +++ gpsd-3.8/SConstruct	2013-03-01 19:07:33.045812503 +0100
-@@ -273,8 +273,6 @@
-     env.Prepend(LIBPATH=[installdir('libdir')])
- else:
-     env.Prepend(LIBPATH=[env["sysroot"] + installdir('libdir')])
+@@ -287,8 +287,6 @@
+ # Honor the specified installation prefix in link paths.
+ if env["sysroot"]:
+     env.Prepend(LIBPATH=[env["sysroot"] + installdir('libdir', add_destdir=False)])
 -if env["shared"]:
 -    env.Prepend(RPATH=[installdir('libdir')])
  
@@ -19,18 +19,12 @@
  
  libraries = [compiled_gpslib, compiled_gpsdlib]
  
---- gpsd-3.8/SConstruct.orig	2013-03-01 19:26:46.005764118 +0100
-+++ gpsd-3.8/SConstruct	2013-03-01 19:54:31.782360879 +0100
-@@ -268,12 +268,6 @@
-     wrapped.replace("/usr/etc", "/etc")
-     return wrapped
+@@ -976,7 +976,7 @@
+ #          linking
+ # The final executable will build but not be portable.
+ 
+-env.StaticLibrary(target = 'libgps.a', source = libgps_sources)
++env.StaticLibrary(target = 'libgps.a', source = libgps_sources, parse_flags = dbus_libs)
+ 
+ # Source groups
  
--# Honor the specified installation prefix in link paths.
--if not env["sysroot"]:
--    env.Prepend(LIBPATH=[installdir('libdir')])
--else:
--    env.Prepend(LIBPATH=[env["sysroot"] + installdir('libdir')])
--
- # Give deheader a way to set compiler flags
- if 'MORECFLAGS' in os.environ:
-     env.Append(CFLAGS=Split(os.environ['MORECFLAGS']))
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gpsd.git/commitdiff/b7bddaefa2cdb83b5645164c4152406d8cc7d3ba