[gpsd] update to 3.3

[Miroslav Lichvar]

commit 1f146dd2027b935693d0a056c276df5c7f4ade74
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Mon Oct 31 15:53:58 2011 +0100

    update to 3.3

 .gitignore                 |    1 +
 gpsd-2.94-silentmake.patch |   12 --------
 gpsd-scons.patch           |   61 +++++++++++++++++++++----------------------
 gpsd.spec                  |   13 ++++++---
 sources                    |    2 +-
 5 files changed, 40 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c49adb6..d516ec9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /gpsd-3.0.tar.gz
 /gpsd-3.1.tar.gz
+/gpsd-3.3.tar.gz
diff --git a/gpsd-scons.patch b/gpsd-scons.patch
index 852e0d7..2c1ab69 100644
--- a/gpsd-scons.patch
+++ b/gpsd-scons.patch
@@ -1,44 +1,43 @@
-diff -up gpsd-3.1/SConstruct.scons gpsd-3.1/SConstruct
---- gpsd-3.1/SConstruct.scons	2011-08-28 13:14:24.000000000 +0200
-+++ gpsd-3.1/SConstruct	2011-08-29 16:18:11.701614604 +0200
-@@ -208,14 +208,12 @@ def installdir(dir):
+diff -up gpsd-3.3/SConstruct.scons gpsd-3.3/SConstruct
+--- gpsd-3.3/SConstruct.scons	2011-10-29 13:48:53.000000000 +0200
++++ gpsd-3.3/SConstruct	2011-10-31 15:42:33.616170514 +0100
+@@ -255,7 +255,6 @@ def installdir(dir):
  
  # Honor the specified installation prefix in link paths.
- env.Prepend(LIBPATH=[os.path.join(env['prefix'], installdir('libdir'))])
--env.Prepend(RPATH=[os.path.join(env['prefix'], installdir('libdir'))])
- 
- # Tell generated binaries to look in the current directory for
- # shared libraries. Should be handled sanely by scons on all systems.
- # Not good to use '.' or a relative path here; it's a security risk.
- # At install time we should use chrpath to edit this out of RPATH.
- env.Prepend(LIBPATH=[os.path.realpath(os.curdir)])
--env.Prepend(RPATH=[os.path.realpath(os.curdir)])
+ env.Prepend(LIBPATH=[installdir('libdir')])
+-env.Prepend(RPATH=[installdir('libdir')])
  
  # Give deheader a way to set compiler flags
  if 'MORECFLAGS' in os.environ:
-@@ -409,6 +407,7 @@ if config.CheckExecutable('$CHRPATH -v',
-     have_chrpath = True
- else:
-     have_chrpath = False
-+have_chrpath = False
- 
- # Map options to libraries required to support them that might be absent.
- optionrequires = {
-@@ -686,7 +685,7 @@ compiled_gpslib = Library(env=env,
- compiled_gpsdlib = Library(env=env,
-                            target="gpsd",
-                            sources=libgpsd_sources,
--                           version=libversion, parse_flags=usblibs + rtlibs + bluezlibs)
-+                           version=libversion, parse_flags=usblibs + bluezlibs + [ "-lm", "-lgps"])
+@@ -380,11 +379,8 @@ if config.CheckExecutable('$CHRPATH -v',
+     # handled sanely by scons on all systems.  Not good to use '.' or
+     # a relative path here; it's a security risk.  At install time we
+     # use chrpath to edit this out of RPATH.
+-    env.Prepend(LIBPATH=[os.path.realpath(os.curdir)])
+-    env.Prepend(RPATH=[os.path.realpath(os.curdir)])
+-else:
+-    print "The chrpath utility is required for GPSD to build."
+-    quit()
++    pass
++env.Prepend(LIBPATH=[os.path.realpath(os.curdir)])
  
- libraries = [compiled_gpslib, compiled_gpsdlib]
+ confdefs = ["/* gpsd_config.h.  Generated by scons, do not hand-hack.  */\n"]
  
-@@ -896,7 +895,7 @@ if st != 0:
+@@ -962,7 +958,7 @@ if st != 0:
      from datetime import datetime
      rev = datetime.now().isoformat()[:-4]
  revision='#define REVISION "%s"\n' %(rev.strip(),)
 -env.NoClean(env.Textfile(target="revision.h", source=[revision]))
 +#env.NoClean(env.Textfile(target="revision.h", source=[revision]))
  
- generated_sources = ['packet_names.h', 'timebase.h', 'gpsd.h', "ais_json.i",
-                      'gps_maskdump.c', 'ais_json.c', 'revision.h']
+ # generate pps_pin.h
+ pps_pin = env['pps_pin']
+@@ -1102,8 +1098,6 @@ binaryinstall.append(LibraryInstall(env,
+ if qt_env:
+     binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib))
+ 
+-env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' % installdir('libdir'))
+-
+ if not env['debug'] and not env['profiling'] and env['strip']:
+     env.AddPostAction(binaryinstall, '$STRIP $TARGET')
+ 
diff --git a/gpsd.spec b/gpsd.spec
index d4b8c93..f7546ca 100644
--- a/gpsd.spec
+++ b/gpsd.spec
@@ -1,16 +1,16 @@
 Name: gpsd
-Version: 3.1
+Version: 3.3
 Release: 1%{?dist}
 Summary: Service daemon for mediating access to a GPS
 
 Group: System Environment/Daemons
 License: BSD
-URL: http://developer.berlios.de/projects/gpsd/
-Source0: http://download.berlios.de/gpsd/%{name}-%{version}.tar.gz
+URL: http://catb.org/gpsd/
+Source0: http://download.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.gz
 Source10: gpsd.service
 Source11: gpsd.sysconfig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# fix RPATH, libs and revision.h
+# fix RPATH and revision.h
 Patch0:   gpsd-scons.patch
 
 BuildRequires: dbus-devel dbus-glib-devel ncurses-devel xmlto python-devel
@@ -187,7 +187,7 @@ fi
 
 %files devel
 %defattr(-,root,root,-)
-%doc TODO www/client-howto.txt
+%doc TODO
 %{_bindir}/gpsfake
 %{_libdir}/libgps*.so
 %{_libdir}/pkgconfig/*.pc
@@ -228,6 +228,9 @@ fi
 
 
 %changelog
+* Mon Oct 31 2011 Miroslav Lichvar <mlichvar at redhat.com> - 3.3-1
+- update to 3.3
+
 * Mon Aug 29 2011 Miroslav Lichvar <mlichvar at redhat.com> - 3.1-1
 - update to 3.1
 
diff --git a/sources b/sources
index 3b62373..5c0fb4c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f280b914c19da3a91aa5e67d83d35033  gpsd-3.1.tar.gz
+4cfdcfd88e925f4d0d6c2272fc573ab5  gpsd-3.3.tar.gz