Accepting request 39855 from vdr

Copy from vdr/lirc based on submit request 39855 from user lnussel

OBS-URL: https://build.opensuse.org/request/show/39855
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lirc?expand=0&rev=33

0001-add-missing-format-args.diff

@@ -0,0 +1,26 @@
+From 1fc45f896bfc0384a5bddab41e38036d4f012811 Mon Sep 17 00:00:00 2001
+From: Ludwig Nussel <ludwig.nussel@suse.de>
+Date: Wed, 12 May 2010 11:12:01 +0200
+Subject: [PATCH] add missing format args
+
+---
+ drivers/lirc_dev/lirc_dev.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/lirc_dev/lirc_dev.c b/drivers/lirc_dev/lirc_dev.c
+index 02db7f4..93e894e 100644
+--- a/drivers/lirc_dev/lirc_dev.c
++++ b/drivers/lirc_dev/lirc_dev.c
+@@ -754,7 +754,8 @@ static int irctl_ioctl(struct inode *inode, struct file *file,
+ 	case LIRC_SET_REC_MODE:
+ 	case LIRC_SET_SEND_MODE:
+ 		printk(KERN_NOTICE LOGHEAD "userspace uses outdated ioctl "
+-			"please update your lirc installation\n");
++			"please update your lirc installation\n",
++			ir->d.name, ir->d.minor);
+ 		break;
+ 	default:
+ 		break;
+-- 
+1.6.4.2
+

lirc-0.8.6.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0a82e73b1bbf1712cff9d757739f9a2083be246d1b1d071f8808b5e6cca4d1a1
-size 730341

lirc-0.8.7_0CVS201005120922.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c28f39906be5ba2175b15a3b010297730552b82b0c0c5015f68dc2117a3ff884
+size 489965

lirc-kernel.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May 12 09:22:57 UTC 2010 - lnussel@suse.de
+
+- update to current CVS to fix build with newer kernels
+
 -------------------------------------------------------------------
 Wed Sep 16 08:03:55 UTC 2009 - lnussel@suse.de
 

lirc-kernel.spec

@@ -18,6 +18,7 @@
 # norootforbuild
 # icecream 0
 
+%define snapshot  0.8.7_0CVS201005120922
 
 Name:           lirc-kernel
 BuildRequires:  kernel-source kernel-syms module-init-tools
@@ -29,6 +30,7 @@ Release:        1
 Source0:        lirc-%{?snapshot}%{!?snapshot:%version}.tar.bz2
 Source1:        Makefile.module
 Source2:        Makefile.modsub
+Patch1:         0001-add-missing-format-args.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExcludeArch:    s390 s390x
 %suse_kernel_module_package -n lirc kdump um debug
@@ -52,6 +54,7 @@ receivers for the serial port.
 
 %prep
 %setup -q -n lirc-%{?snapshot}%{!?snapshot:%version}
+%patch1 -p1
 autoreconf -f -i
 PYTHON=/usr/bin/python \
 	./configure --with-driver=all

lirc.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May 12 09:22:57 UTC 2010 - lnussel@suse.de
+
+- update to current CVS to fix build with newer kernels
+
 -------------------------------------------------------------------
 Tue May  4 08:16:15 UTC 2010 - lnussel@suse.de
 

lirc.spec

@@ -17,6 +17,7 @@
 
 # norootforbuild
 
+%define snapshot  0.8.7_0CVS201005120922
 
 Name:           lirc
 BuildRequires:  alsa-devel xorg-x11-devel
@@ -39,6 +40,9 @@ BuildRequires:  i2c-tools
 %if 0%suse_version > 1020
 BuildRequires:  fdupes
 %endif
+%if 0%{?snapshot:1}
+BuildRequires:  help2man
+%endif
 Url:            http://www.lirc.org/
 License:        GPLv2+
 Group:          Hardware/Other
@@ -153,6 +157,11 @@ chmod -R u+w remotes
 chmod -R +r remotes
 rm -rf remotes/*/.xvpics/
 perl %{SOURCE6} remotes
+%if 0%{?snapshot:1}
+if [ ! -e doc/lirc.hwdb ]; then
+	make -C doc release
+fi
+%endif
 
 %install
 # lirc