[urg] Fix FTBFS rhbz #913842

[mbooth]

commit 3cd86fd96bd41ce04b40bb10363e3e934bf72279
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Tue Jul 9 11:57:08 2013 +0100

    Fix FTBFS rhbz #913842
    
    - Fix aarch64 support rhbz #926685
    - Update to latest upstream and drop unneeded patches

 .gitignore                        |    1 +
 sources                           |    2 +-
 urg-0.8.11-gcc46.patch            |   33 ---------------------------------
 urg-0.8.11-gcc47.patch            |   10 ----------
 urg-0.8.18-missing-includes.patch |   11 +++++++++++
 urg-0.8.7-noforwdecl.patch        |   12 ------------
 urg.spec                          |   32 ++++++++++++++------------------
 7 files changed, 27 insertions(+), 74 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2aad101..35f929e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /x86_64
 *.log
 *.rpm
+/urg-0.8.18.zip
diff --git a/sources b/sources
index 39e237e..fb127ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-56e35d83f5ca5692f5bb4114dbacfaf5  urg-0.8.11.zip
+93f90d2ccc36e784407c5282ef6bd2cb  urg-0.8.18.zip
diff --git a/urg-0.8.18-missing-includes.patch b/urg-0.8.18-missing-includes.patch
new file mode 100644
index 0000000..0e8ecd8
--- /dev/null
+++ b/urg-0.8.18-missing-includes.patch
@@ -0,0 +1,11 @@
+diff -ur urg-0.8.18.orig/src/c/connection/serial_ctrl_lin.c urg-0.8.18/src/c/connection/serial_ctrl_lin.c
+--- urg-0.8.18.orig/src/c/connection/serial_ctrl_lin.c	2010-11-22 01:48:01.000000000 +0000
++++ urg-0.8.18/src/c/connection/serial_ctrl_lin.c	2013-07-09 11:16:16.659693677 +0100
+@@ -14,6 +14,7 @@
+ #include "ring_buffer.h"
+ #include <unistd.h>
+ #include <stdio.h>
++#include <sys/types.h>
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <string.h>
diff --git a/urg.spec b/urg.spec
index 4318113..6d81f91 100644
--- a/urg.spec
+++ b/urg.spec
@@ -1,15 +1,13 @@
 Name:           urg
-Version:        0.8.11
-Release:        7%{?dist}
+Version:        0.8.18
+Release:        1%{?dist}
 Summary:        Library to access Hokuyo URG laser range finders
 
 Group:          System Environment/Libraries
 License:        LGPLv3
 URL:            http://www.hokuyo-aut.jp/cgi-bin/urg_programs_en/
-Source0:        http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/urg-0.8.11.zip
-Patch0:         urg-0.8.7-noforwdecl.patch
-Patch1:         urg-0.8.11-gcc46.patch
-Patch2:         urg-0.8.11-gcc47.patch
+Source0:        http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/urg-%{version}.zip
+Patch0:         urg-0.8.18-missing-includes.patch
 
 BuildRequires:  autoconf automake libtool
 BuildRequires:  SDL_net-devel
@@ -24,7 +22,7 @@ Hokuyo URG laser range finder series.
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:	boost-devel
+Requires:       boost-devel
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -33,17 +31,12 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .noforwdecl
-%patch1 -p1 -b .gcc46
-%patch2 -p1 -b .gcc47
+%patch0 -p1 -b .missing-includes
+
 
 %build
-#libtoolize --copy
-#aclocal -I m4
-#autoconf
-#automake
-# Required due to Boost 1.33.1 patch
-#autoreconf --install --force
+# autoreconf required for supporting aarch64 see rhbz #926685
+autoreconf -i -f
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -59,18 +52,21 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %files
-%defattr(-,root,root,-)
 %doc ChangeLog AUTHORS COPYING README
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %{_bindir}/*
 %{_includedir}/*
 %{_libdir}/*.so
 
 
 %changelog
+* Tue Jul 09 2013 Mat Booth <fedora at matbooth.co.uk> - 0.8.18-1
+- Fix FTBFS rhbz #913842
+- Fix aarch64 support rhbz #926685
+- Update to latest upstream and drop unneeded patches
+
 * Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 0.8.11-7
 - Rebuild for Boost-1.53.0