[gpsd] update to 3.1

[Miroslav Lichvar]

commit 03a021ec4e9b136d79cc25ae6235856edda4e2cd
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Mon Aug 29 17:41:21 2011 +0200

    update to 3.1

 .gitignore       |    1 +
 gpsd-priv.patch  |  193 ------------------------------------------------------
 gpsd-scons.patch |   31 ++-------
 gpsd.spec        |   15 +++--
 sources          |    2 +-
 5 files changed, 17 insertions(+), 225 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d250df1..c49adb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /gpsd-3.0.tar.gz
+/gpsd-3.1.tar.gz
diff --git a/gpsd-scons.patch b/gpsd-scons.patch
index 30b9215..41de621 100644
--- a/gpsd-scons.patch
+++ b/gpsd-scons.patch
@@ -1,16 +1,7 @@
-diff -up gpsd-3.0/SConstruct.scons gpsd-3.0/SConstruct
---- gpsd-3.0/SConstruct.scons	2011-08-19 07:36:28.000000000 +0200
-+++ gpsd-3.0/SConstruct	2011-08-22 16:35:20.763702823 +0200
-@@ -155,7 +155,7 @@ for i in ["AR", "ARFLAGS", "CCFLAGS", "C
-         j = i
-         if i == "LD":
-             i = "SHLINK"
--        env[j]=os.getenv(i)
-+        env[j]=Split(os.getenv(i))
- for flags in ["LDFLAGS", "CPPFLAGS"]:
-     if os.environ.has_key(flags):
-         env.MergeFlags([os.getenv(flags)])
-@@ -194,14 +194,12 @@ def installdir(dir):
+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):
  
  # Honor the specified installation prefix in link paths.
  env.Prepend(LIBPATH=[os.path.join(env['prefix'], installdir('libdir'))])
@@ -25,17 +16,7 @@ diff -up gpsd-3.0/SConstruct.scons gpsd-3.0/SConstruct
  
  # Give deheader a way to set compiler flags
  if 'MORECFLAGS' in os.environ:
-@@ -217,8 +215,7 @@ env.SourceCode('.', None)
- 
- # Should we build with debug symbols?
- if env['debug']:
--    env.Append(CCFLAGS=['-g'])
--    env.Append(CCFLAGS=['-O0'])
-+    pass
- else:
-     env.Append(CCFLAGS=['-O2'])
- 
-@@ -383,6 +380,7 @@ if config.CheckExecutable('$CHRPATH -v',
+@@ -409,6 +407,7 @@ if config.CheckExecutable('$CHRPATH -v',
      have_chrpath = True
  else:
      have_chrpath = False
@@ -43,7 +24,7 @@ diff -up gpsd-3.0/SConstruct.scons gpsd-3.0/SConstruct
  
  # Map options to libraries required to support them that might be absent.
  optionrequires = {
-@@ -822,7 +820,7 @@ if st != 0:
+@@ -896,7 +895,7 @@ if st != 0:
      from datetime import datetime
      rev = datetime.now().isoformat()[:-4]
  revision='#define REVISION "%s"\n' %(rev.strip(),)
diff --git a/gpsd.spec b/gpsd.spec
index a0603a9..82102ec 100644
--- a/gpsd.spec
+++ b/gpsd.spec
@@ -1,5 +1,5 @@
 Name: gpsd
-Version: 3.0
+Version: 3.1
 Release: 1%{?dist}
 Summary: Service daemon for mediating access to a GPS
 
@@ -12,7 +12,6 @@ Source11: gpsd.sysconfig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fix RPATH, CFLAGS and revision.h
 Patch0:   gpsd-scons.patch
-Patch1:   gpsd-priv.patch
 
 BuildRequires: dbus-devel dbus-glib-devel ncurses-devel xmlto python-devel
 BuildRequires: scons desktop-file-utils bluez-libs-devel pps-tools-devel
@@ -74,14 +73,12 @@ can run on a serial terminal or terminal emulator.
 %prep
 %setup -q
 %patch0 -p1 -b .scons
-%patch1 -p1 -b .priv
 
 echo '#define REVISION "release-%{version}-%{release}"' > revision.h
 
 %build
-export CFLAGS="%{optflags}"
-# fails with %{_smp_mflags}
-scons \
+export CCFLAGS="%{optflags}"
+scons %{_smp_mflags} \
 	dbus=yes \
 	systemd=yes \
 	libQgpsmm=no \
@@ -94,11 +91,14 @@ scons \
 	sbindir=%{_sbindir} \
 	mandir=%{_mandir} \
 	docdir=%{_docdir} \
+	pkgconfigdir=%{_libdir}/pkgconfig \
 	build
 
 
 %install
 rm -rf %{buildroot}
+# avoid rebuilding
+export CCFLAGS="%{optflags}"
 DESTDIR=%{buildroot} scons install
 
 # service files
@@ -227,6 +227,9 @@ fi
 
 
 %changelog
+* Mon Aug 29 2011 Miroslav Lichvar <mlichvar at redhat.com> - 3.1-1
+- update to 3.1
+
 * Tue Aug 23 2011 Miroslav Lichvar <mlichvar at redhat.com> - 3.0-1
 - update to 3.0
 - enable PPSAPI support
diff --git a/sources b/sources
index 67e348b..3b62373 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c63d41a26868e9bdd48d9e311a9cc42c  gpsd-3.0.tar.gz
+f280b914c19da3a91aa5e67d83d35033  gpsd-3.1.tar.gz