Merge commit 'f3af4fe721efab781b9e5461967a0ea230c4c449' into f14

Conflicts:
	lirc.spec

branch

@@ -0,0 +1 @@
+F-13

lirc.spec

@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.6
-Release:        6%{?pre:.%{pre}}%{?dist}
+Release:        8%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -34,8 +34,8 @@ Patch1:         lirc-0.8.6-devinput-pass-mouse-events.patch
 # http://thread.gmane.org/gmane.comp.hardware.lirc/6884
 Patch2:		lirc-0.8.6-standardized-remote-keycodes.patch
 Patch3:         lirc-0.8.4-make-remote-names-all-unique.patch
-Patch4:         lirc-0.8.6-ioctl-portability.patch
-Patch5:         lirc-0.8.6-remove-obsolete-modes.patch
+Patch4:         lirc-0.8.6-remove-obsolete-modes.patch
+Patch5:         lirc-0.8.6-devinput-conf-update.patch
 Patch6:         lirc-0.8.6-firefly-def.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -292,13 +292,20 @@ fi
 
 
 %changelog
-* Thu Jul 08 2010 Jarod Wilson <jarod@redhat.com> 0.8.6-6
+* Thu Jul 08 2010 Jarod Wilson <jarod@redhat.com> 0.8.6-8
 - Fix up sub-package license file inclusion per new fedora
   licensing guidelines
+- Update to lirc 0.8.7pre2 snapshot
 
-* Fri May 21 2010 Bastien Nocera <bnocera@redhat.com> 0.8.6-5
+* Fri May 21 2010 Bastien Nocera <bnocera@redhat.com> 0.8.6-7
 - Fix Firefly remote definition keycodes
 
+* Sun Apr 11 2010 Jarod Wilson <jarod@redhat.com> 0.8.6-6
+- Revert to compat-ioctls per upstream discussion (#581326)
+
+* Wed Mar 17 2010 Jarod Wilson <jarod@redhat.com> 0.8.6-5
+- Update devinput lircd.conf with additional keys from input.h
+
 * Mon Feb 15 2010 Jarod Wilson <jarod@redhat.com> 0.8.6-4
 - Un-bungle newly introduced segfault in prior build