diff --git a/lirc-0.8.4-2.6.28.patch b/lirc-0.8.4-2.6.28.patch new file mode 100644 index 0000000..6060ac1 --- /dev/null +++ b/lirc-0.8.4-2.6.28.patch @@ -0,0 +1,22 @@ +--- lirc-0.8.4/drivers/kcompat.h 2009/02/23 00:02:43 1.1 ++++ lirc-0.8.4/drivers/kcompat.h 2009/02/23 00:16:42 +@@ -374,5 +374,9 @@ + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 11) + #define DEFINE_SPINLOCK(x) spinlock_t x = SPIN_LOCK_UNLOCKED + #endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) ++#define info(args...) printk(KERN_INFO KBUILD_MODNAME args) ++#define warn(args...) printk(KERN_WARNING KBUILD_MODNAME args) ++#endif + + #endif /* _KCOMPAT_H */ +--- lirc-0.8.4/drivers/lirc_cmdir/commandir.c 2009/02/23 00:15:27 1.1 ++++ lirc-0.8.4/drivers/lirc_cmdir/commandir.c 2009/02/23 00:15:35 +@@ -25,6 +25,7 @@ + #include + #include + #include "commandir.h" ++#include "kcompat.h" + + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) + #include diff --git a/lirc-kernel.changes b/lirc-kernel.changes index 08d904c..d9687c7 100644 --- a/lirc-kernel.changes +++ b/lirc-kernel.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 23 01:11:00 CET 2009 - ro@suse.de + +- fix build with current kernel + (info and warn vanished, use printk) + ------------------------------------------------------------------- Thu Nov 13 11:44:28 CET 2008 - lnussel@suse.de diff --git a/lirc-kernel.spec b/lirc-kernel.spec index 29f489b..a39ebe1 100644 --- a/lirc-kernel.spec +++ b/lirc-kernel.spec @@ -32,6 +32,7 @@ Source2: Makefile.modsub #Patch0: lirc-0.8.4pre1-kernel-2.6.27.diff # http://brakemeier.de/electronics/vdr/lirc-imon.html Patch1: lirc-0.8.3pre1-imon-pad2keys.patch +Patch2: lirc-0.8.4-2.6.28.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: s390 s390x %suse_kernel_module_package -n lirc kdump um debug @@ -88,6 +89,7 @@ mv lirc_imon2/lirc_imon.c lirc_imon2/lirc_imon2.c popd #%patch0 -p0 %patch1 -p1 +%patch2 -p1 autoreconf -f -i PYTHON=/usr/bin/python \ ./configure --with-driver=all @@ -118,6 +120,9 @@ for flavor in %flavors_to_build; do done %changelog +* Mon Feb 23 2009 ro@suse.de +- fix build with current kernel + (info and warn vanished, use printk) * Thu Nov 13 2008 lnussel@suse.de - don't build on s390, fails all the time and doesn't make sense anyways * Mon Oct 13 2008 lnussel@suse.de