[lirc/f14/master: 5/7] Merge commit 'f3af4fe721efab781b9e5461967a0ea230c4c449' into f14

[Jarod Wilson]

commit a65a30b41cd15d246f69d11e9d96ce430176060c
Merge: f2a0eb6 f3af4fe
Author: Jarod Wilson <jarod at redhat.com>
Date:   Mon Aug 2 16:07:13 2010 -0400

    Merge commit 'f3af4fe721efab781b9e5461967a0ea230c4c449' into f14
    
    Conflicts:
    	lirc.spec

 branch                                |    1 +
 lirc-0.8.6-devinput-conf-update.patch | 1340 +++++++++++++++++++++++++++++++++
 lirc.spec                             |   17 +-
 3 files changed, 1353 insertions(+), 5 deletions(-)
---
diff --cc lirc.spec
index 333d2a7,6e5fe4d..400d2d5
--- a/lirc.spec
+++ b/lirc.spec
@@@ -18,7 -18,7 +18,7 @@@
  
  Name:           lirc
  Version:        0.8.6
- Release:        6%{?pre:.%{pre}}%{?dist}
 -Release:        7%{?pre:.%{pre}}%{?dist}
++Release:        8%{?pre:.%{pre}}%{?dist}
  Summary:        The Linux Infrared Remote Control package
  
  Group:          System Environment/Daemons
@@@ -292,13 -291,15 +292,20 @@@ f
  
  
  %changelog
- * Thu Jul 08 2010 Jarod Wilson <jarod at redhat.com> 0.8.6-6
++* Thu Jul 08 2010 Jarod Wilson <jarod at 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 at redhat.com> 0.8.6-5
+ * Fri May 21 2010 Bastien Nocera <bnocera at redhat.com> 0.8.6-7
  - Fix Firefly remote definition keycodes
  
+ * Sun Apr 11 2010 Jarod Wilson <jarod at redhat.com> 0.8.6-6
+ - Revert to compat-ioctls per upstream discussion (#581326)
+ 
+ * Wed Mar 17 2010 Jarod Wilson <jarod at redhat.com> 0.8.6-5
+ - Update devinput lircd.conf with additional keys from input.h
+ 
  * Mon Feb 15 2010 Jarod Wilson <jarod at redhat.com> 0.8.6-4
  - Un-bungle newly introduced segfault in prior build