[gpsd] update to 3.4

[Miroslav Lichvar]

commit 41cc0ddce1b4efe99d184a0828a9801dc52320cf
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Thu Jan 26 14:30:25 2012 +0100

    update to 3.4

 .gitignore       |    1 +
 gpsd-scons.patch |   43 -------------------------------------------
 gpsd.spec        |   19 ++++++++++++-------
 sources          |    2 +-
 4 files changed, 14 insertions(+), 51 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d516ec9..6ef2268 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /gpsd-3.0.tar.gz
 /gpsd-3.1.tar.gz
 /gpsd-3.3.tar.gz
+/gpsd-3.4.tar.gz
diff --git a/gpsd.spec b/gpsd.spec
index f6b67d2..564dc25 100644
--- a/gpsd.spec
+++ b/gpsd.spec
@@ -1,6 +1,6 @@
 Name: gpsd
-Version: 3.3
-Release: 2%{?dist}
+Version: 3.4
+Release: 1%{?dist}
 Summary: Service daemon for mediating access to a GPS
 
 Group: System Environment/Daemons
@@ -10,11 +10,10 @@ Source0: http://download.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.g
 Source10: gpsd.service
 Source11: gpsd.sysconfig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# fix RPATH and revision.h
-Patch0:   gpsd-scons.patch
 
 BuildRequires: dbus-devel dbus-glib-devel ncurses-devel xmlto python-devel
 BuildRequires: scons desktop-file-utils bluez-libs-devel pps-tools-devel
+BuildRequires: chrpath
 %ifnarch s390 s390x
 BuildRequires: libusb1-devel
 %endif
@@ -72,9 +71,6 @@ can run on a serial terminal or terminal emulator.
 
 %prep
 %setup -q
-%patch0 -p1 -b .scons
-
-echo '#define REVISION "release-%{version}-%{release}"' > revision.h
 
 %build
 export CCFLAGS="%{optflags}"
@@ -137,6 +133,12 @@ desktop-file-install --vendor fedora \
 # Not needed since gpsd.h is not installed
 rm %{buildroot}%{_libdir}/{libgpsd.so,pkgconfig/libgpsd.pc}
 
+# Remove RPATH (even the actual string)
+for i in %{buildroot}%{python_sitearch}/gps/*.so; do
+	chrpath -r "" $i
+	chrpath -d $i
+done
+
 %clean
 rm -rf %{buildroot}
 
@@ -228,6 +230,9 @@ fi
 
 
 %changelog
+* Thu Jan 26 2012 Miroslav Lichvar <mlichvar at redhat.com> - 3.4-1
+- update to 3.4
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 5c0fb4c..bb2d517 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4cfdcfd88e925f4d0d6c2272fc573ab5  gpsd-3.3.tar.gz
+c01353459faa68834309109d4e868460  gpsd-3.4.tar.gz