[camE] fix FTBFS

[Tom Callaway]

commit ecc4e6994bb9dfa7c5e165e3c9796d1f7e99ad19
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Fri Mar 9 14:39:52 2012 -0500

    fix FTBFS

 camE-1.9-header-fixes.patch |   17 +++++++++++++++++
 camE.spec                   |   22 ++++++++--------------
 2 files changed, 25 insertions(+), 14 deletions(-)
---
diff --git a/camE-1.9-header-fixes.patch b/camE-1.9-header-fixes.patch
new file mode 100644
index 0000000..f4d837f
--- /dev/null
+++ b/camE-1.9-header-fixes.patch
@@ -0,0 +1,17 @@
+diff -up camE-1.9/webcam.c.fix camE-1.9/webcam.c
+--- camE-1.9/webcam.c.fix	2012-03-09 14:31:50.709893919 -0500
++++ camE-1.9/webcam.c	2012-03-09 14:32:59.121236704 -0500
+@@ -24,12 +24,11 @@
+ #include <X11/Xlib.h>
+ #include <Imlib2.h>
+ #include <giblib.h>
+-#include <curl/types.h>
+ #include <curl/curl.h>
+ #include <curl/easy.h>
+ 
+ #include <sys/types.h>
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+ 
+ #include <net/if.h>
+ 
diff --git a/camE.spec b/camE.spec
index 7b5a550..830028d 100644
--- a/camE.spec
+++ b/camE.spec
@@ -1,7 +1,7 @@
 Summary: Rewrite of the xawtv webcam app, which adds imlib2 support
 Name: camE
 Version: 1.9
-Release: 17
+Release: 18%{?dist}
 # COPYING is GPLv2 but no source files contain "or any later version" except
 # pwc-ioctl.h which was taken from the pwc kernel module.
 License: GPLv2
@@ -11,43 +11,37 @@ Source: http://linuxbrit.co.uk/downloads/camE-%{version}.tar.gz
 Patch0: camE-1.9-cflags.patch
 Patch1: camE-1.9-curlopt.patch
 Patch2: camE-1.9-libv4l1.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Patch3: camE-1.9-header-fixes.patch
 BuildRequires: giblib-devel, curl-devel, zlib-devel, libv4l-devel
 
 %description
 camE is a rewrite of the xawtv webcam app, which adds imlib2 support and
 thus many new possibilities.
 
-
 %prep
 %setup -q
 %patch0 -p1 -b .cflags
 %patch1 -p1 -b .curlopt
-%patch2 -p1
-
+%patch2 -p1 -b .v4l1
+%patch3 -p1 -b .headers
 
 %build
 export CFLAGS="%{optflags} -DCONFIG_VIDEO_V4L1_COMPAT=1"
-%{__make} %{?_smp_mflags}
-
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
 # Using DESTDIR= does not work...
 %makeinstall
 
-
-%clean
-%{__rm} -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING *.style example.camErc*
 %{_bindir}/camE
 
 
 %changelog
+* Fri Mar  9 2012 Tom Callaway <spot at fedoraproject.org> - 1.9-18
+- fix FTBFS
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild