[gearbox] Update to 10.11

[rmattes]

commit 6a69a385a1e4e0378923d86f9ab218c2631e56cd
Author: Rich Mattes <richmattes at gmail.com>
Date:   Sat Jul 7 12:16:32 2012 -0400

    Update to 10.11
    
    - Remove flexiport and hokuyo_aist (they are in separate packages now)
    - Remove flexiport and hokuyo_aist licenses from spec

 gearbox-9.11.fixpkgconfig.patch                    |   72 --------------------
 ...ox-9.11.gcc48.patch => gearbox-9.11.gcc47.patch |    0
 gearbox.spec                                       |   39 +++++++----
 3 files changed, 25 insertions(+), 86 deletions(-)
---
diff --git a/gearbox-9.11.gcc48.patch b/gearbox-9.11.gcc47.patch
similarity index 100%
rename from gearbox-9.11.gcc48.patch
rename to gearbox-9.11.gcc47.patch
diff --git a/gearbox.spec b/gearbox.spec
index 88bea46..5861462 100644
--- a/gearbox.spec
+++ b/gearbox.spec
@@ -1,21 +1,20 @@
 Name:           gearbox
-Version:        9.11
-Release:        10%{?dist}
+Version:        10.11
+Release:        1%{?dist}
 Summary:        A collection of usable peer-reviewed robotics-related libraries
 
 Group:          Development/Libraries
-License:        LGPLv3 and LGPLv2+ and GPLv2+
+License:        LGPLv2+ and GPLv2+
 URL:            http://gearbox.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# Moves the library installation path from %libdir/name to %libdir
+# Moves the library installation path from libdir/name to libdir
 Patch0:         gearbox-9.11.fixinstallpaths.patch
-# Fixes some pkg-config errors, submitted at https://sourceforge.net/tracker/?func=detail&aid=2951375&group_id=216468&atid=1037801
-Patch1:         gearbox-9.11.fixpkgconfig.patch
 # Fixes DSO-related link errors.  Not yet submitted upstream
-Patch2:         gearbox-9.11.fixdso.patch
+Patch1:         gearbox-9.11.fixdso.patch
 # Add detection of s390x architecture
-Patch3:         gearbox-9.11.s390.patch
-Patch4:         gearbox-9.11.gcc48.patch
+Patch2:         gearbox-9.11.s390.patch
+# Fix build errors with gcc-4.7
+Patch3:         gearbox-9.11.gcc47.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -58,13 +57,20 @@ you will need to install %{name}-devel.
 %setup -q
 # Moves shared libraries from libdir/gearbox to libdir, as per FHS standards
 %patch0 -p1 -b .fixinstallpaths
-%patch1 -p1 -b .fixpkgconfig
-%patch2 -p1 -b .fixdso
-%patch3 -p1 -b .s390
-%patch4 -p0 -b .gcc48
+%patch1 -p1 -b .fixdso
+%patch2 -p1 -b .s390
+%patch3 -p0 -b .gcc48
 
 %build
-%cmake -DENABLE_LIB_BASICEXAMPLE=OFF -DENABLE_LIB_GBXUTILACFR=ON -DENABLE_LIB_GBXGARMINACFR=ON -DENABLE_LIB_GBXSERIALACFR=ON -DHOKUYO_AIST_BUILD_BINDINGS=OFF -DGBX_BUILD_TESTS=ON -DCMAKE_SKIP_RPATH:BOOL=ON\
+%cmake \
+  -DENABLE_LIB_FLEXIPORT=OFF \
+  -DENABLE_LIB_BASICEXAMPLE=OFF \
+  -DENABLE_LIB_GBXUTILACFR=ON \
+  -DENABLE_LIB_GBXGARMINACFR=ON \
+  -DENABLE_LIB_GBXSERIALACFR=ON \
+  -DHOKUYO_AIST_BUILD_BINDINGS=OFF \
+  -DGBX_BUILD_TESTS=ON \
+  -DCMAKE_SKIP_RPATH:BOOL=ON\
 %ifarch ppc64 
  -DENABLE_LIB_GBXSICKACFR=OFF\
 %else
@@ -111,6 +117,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jul 07 2012 Rich Mattes <richmattes at gmail.com> - 10.11-1
+- Update to 10.11
+- Remove flexiport and hokuyo_aist (they are in separate packages now)
+- Remove flexiport and hokuyo_aist licenses from spec
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.11-10
 - Rebuilt for c++ ABI breakage