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

lirc-0.8.0-k2.6.18.diff

@@ -1,84 +0,0 @@
---- drivers/kcompat.h
-+++ drivers/kcompat.h
-@@ -8,9 +8,10 @@
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- 
- #include <linux/device.h>
--
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
- #define LIRC_HAVE_DEVFS
- #define LIRC_HAVE_DEVFS_26
-+#endif
- #define LIRC_HAVE_SYSFS
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
---- drivers/lirc_dev/lirc_dev.c
-+++ drivers/lirc_dev/lirc_dev.c
-@@ -49,16 +49,16 @@
- #endif
- #define __KERNEL_SYSCALLS__
- #include <linux/unistd.h>
-+#include "drivers/kcompat.h"
- /* DevFS header */
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
-+#if defined(LIRC_HAVE_DEVFS)
- #include <linux/devfs_fs_kernel.h>
- #endif
- /* SysFS header */
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if defined(LIRC_HAVE_SYSFS)
- #include <linux/device.h>
- #endif
- 
--#include "drivers/kcompat.h"
- #include "drivers/lirc.h"
- #include "lirc_dev.h"
- 
---- drivers/lirc_gpio/lirc_gpio.c
-+++ drivers/lirc_gpio/lirc_gpio.c
-@@ -48,9 +48,12 @@
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
- #include "../drivers/char/bttv.h"
- #include "../drivers/char/bttvp.h"
--#else
-+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17)
- #include "../drivers/media/video/bttv.h"
- #include "../drivers/media/video/bttvp.h"
-+#else
-+#include "../drivers/media/video/bt8xx/bttv.h"
-+#include "../drivers/media/video/bt8xx/bttvp.h"
- #endif
- 
- #if BTTV_VERSION_CODE < KERNEL_VERSION(0,7,45)
---- drivers/lirc_imon/lirc_imon.c
-+++ drivers/lirc_imon/lirc_imon.c
-@@ -58,10 +58,12 @@
- #include <linux/slab.h>
- #include <asm/uaccess.h>
- #include <linux/usb.h>
-+#include "drivers/kcompat.h"
-+#if defined(LIRC_HAVE_DEVFS)
- #include <linux/devfs_fs_kernel.h>
-+#endif
- 
- #include "drivers/lirc.h"
--#include "drivers/kcompat.h"
- #include "drivers/lirc_dev/lirc_dev.h"
- 
- 
---- drivers/lirc_sasem/lirc_sasem.c
-+++ drivers/lirc_sasem/lirc_sasem.c
-@@ -67,10 +67,12 @@
- #include <linux/slab.h>
- #include <asm/uaccess.h>
- #include <linux/usb.h>
-+#include "drivers/kcompat.h"
-+#if defined(LIRC_HAVE_DEVFS)
- #include <linux/devfs_fs_kernel.h>
-+#endif
- 
- #include "drivers/lirc.h"
--#include "drivers/kcompat.h"
- #include "drivers/lirc_dev/lirc_dev.h"
- 
- 

lirc-kernel.spec

@@ -17,7 +17,7 @@ License:        GNU General Public License (GPL)
 Group:          System/Kernel
 Summary:        LIRC kernel modules
 Version:        0.8.1
-Release:        7
+Release:        8
 Source0:        lirc-0.8.1.tar.bz2
 Source1:        Makefile.module
 Source2:        Makefile.modsub

lirc.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu May 31 13:32:48 CEST 2007 - lnussel@suse.de
+
+- don't install useless contrib stuff 
+- add proper ldconfig and insserv calls
+- make initscript to automatically install
+  linux-input-layer-lircd.conf if lircd.conf doesn't exist and
+  /dev/input/ir is used as device
+- add  /etc/lircd.conf as %ghost
+- don't package /var/run/lirc/lircd
+- don't package all remotes to save space
+
 -------------------------------------------------------------------
 Mon Apr 23 15:11:22 CEST 2007 - hvogel@suse.de
 

lirc.spec

@@ -12,16 +12,18 @@
 
 Name:           lirc
 BuildRequires:  alsa-devel xorg-x11-devel
+%if %suse_version > 1020
+BuildRequires:  fdupes
+%endif
 URL:            http://www.lirc.org/
 License:        GNU General Public License (GPL)
 Group:          Hardware/Other
 Autoreqprov:    on
 Version:        0.8.1
-Release:        16
+Release:        28
 PreReq:         %fillup_prereq
 Summary:        Tools for Infrared Receivers
 Source0:        lirc-0.8.1.tar.bz2
-Source1:        remotes.tar.bz2
 Source4:        rc.lirc
 Source5:        sysconfig.lirc
 Source6:        fix-remote-keys.pl
@@ -30,10 +32,10 @@ Source8:        README.SUSE
 Source9:        51-lirc.rules
 #Patch0:       lirc-hw.diff
 Patch1:         lirc-sockets-in-var.diff
-Patch2:         lirc-0.8.0-k2.6.18.diff
+Patch2:         imon2_conf.patch
-Patch3:         imon2_conf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       udev
+Suggests:       lirc-kmp
 
 %description
 LIRC is a package that supports receiving and sending IR signals with
@@ -45,11 +47,10 @@ control your computer with a remote control.
 
 
 %prep
-%setup -q -a 1 -q
+%setup -q
 #%patch0 -p1 -b .hw
 %patch1 -p1 -b .var
-#%patch2
+%patch2 -p1
-%patch3 -p1
 cp %{SOURCE8} .
 #find . -type d -name CVS -print0 | xargs -0 -- rm -rf
 #find . -name .cvsignore  -print0 | xargs -0 -- rm -rf
@@ -86,7 +87,6 @@ cp -a remotes %{buildroot}/usr/share/lirc
 cp -a %{SOURCE7} %{buildroot}/usr/share/lirc/remotes
 install -d -m 755 %{buildroot}/dev
 mkdir -p %{buildroot}/var/run/lirc
-mkfifo %{buildroot}/var/run/lirc/lircd
 mkfifo %{buildroot}/var/run/lirc/lircm
 chmod 600 %{buildroot}/var/run/lirc/*
 # lircd init scripts
@@ -106,6 +106,19 @@ install -d -m 755 %{buildroot}/etc/udev/rules.d
 install -d -m 755 %{buildroot}/sbin
 install -m 644 %{SOURCE9} %{buildroot}/etc/udev/rules.d
 find %{buildroot}/usr/share/lirc -perm +111 -type f -print0 | xargs -r -0 chmod a-x
+#
+# get rid of libtool file
+rm -f %{buildroot}%{_libdir}/liblirc_client.la
+#
+# get rid of useless contrib stuff
+rm contrib/lirc.*
+%if %suse_version > 1020
+
+%fdupes $RPM_BUILD_ROOT
+%endif
+#
+# ghost file
+install -D -m 644 /dev/null %{buildroot}/etc/lircd.conf
 
 %files
 %defattr (-,root,root)
@@ -117,7 +130,6 @@ find %{buildroot}/usr/share/lirc -perm +111 -type f -print0 | xargs -r -0 chmod
 %{_libdir}/liblirc_client.*
 #%attr (600,root,root) %dev(c,61,0) /dev/lirc	# => udev
 %dir /var/run/lirc
-%attr(660,root,video) /var/run/lirc/lircd
 /var/run/lirc/lircm
 /usr/bin/*
 /usr/sbin/*
@@ -129,11 +141,29 @@ find %{buildroot}/usr/share/lirc -perm +111 -type f -print0 | xargs -r -0 chmod
 /etc/udev/rules.d/51-lirc.rules
 %doc %_mandir/man1/*
 %doc %_mandir/man8/*
+%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/lircd.conf
 
 %post
-%{fillup_only}
+%{fillup_and_insserv lirc}
+/sbin/ldconfig
+
+%postun
+%{insserv_cleanup}
+/sbin/ldconfig
+
+%clean
+rm -rf %{buildroot}
 
 %changelog
+* Thu May 31 2007 - lnussel@suse.de
+- don't install useless contrib stuff
+- add proper ldconfig and insserv calls
+- make initscript to automatically install
+  linux-input-layer-lircd.conf if lircd.conf doesn't exist and
+  /dev/input/ir is used as device
+- add  /etc/lircd.conf as %%ghost
+- don't package /var/run/lirc/lircd
+- don't package all remotes to save space
 * Mon Apr 23 2007 - hvogel@suse.de
 - Add config for imon2 driver with missing keys and pad2key
   addidtion from M. Brakemeier

rc.lirc

@@ -113,12 +113,6 @@ makeargs()
 case "$1" in
     start)
 	echo -n "Starting lircd "
-	if [ ! -e /etc/lircd.conf ]; then
-		echo -n "Error: please create /etc/lircd.conf"
-		rc_failed 6
-		rc_status -v
-		rc_exit
-	fi
 	modinfo evdev > /dev/null 2>&1 && modprobe evdev || :
 	if test "$LIRC_MODULE" != ""; then
 		modprobe "$LIRC_MODULE"
@@ -130,9 +124,19 @@ case "$1" in
 		rc_status -v
 		rc_exit
 	fi
+	if [ ! -e /etc/lircd.conf ]; then
+		if [ "$LIRCD_DEVICE" = "/dev/input/ir" -a -e "$LIRCD_DEVICE" ]; then
+			install -m 644 /usr/share/lirc/remotes/linux-input-layer-lircd.conf /etc/lircd.conf
+		else
+			echo -n "Error: please create /etc/lircd.conf"
+			rc_failed 6
+			rc_status -v
+			rc_exit
+		fi
+	fi
 	[ -n "$LIRCD_DEVICE" ] && echo -n "($LIRCD_DEVICE)"
+	install -m "$LIRCD_DEV_PERMISSIONS" /dev/null /var/run/lirc/lircd
 	chown "$LIRCD_DEV_OWNER"	/var/run/lirc/lircd
-	chmod "$LIRCD_DEV_PERMISSIONS"	/var/run/lirc/lircd
 	if [ ! -L /dev/lircd ]; then
 		rm -f /dev/lircd
 		ln -s /var/run/lirc/lircd /dev/lircd 

remotes.tar.bz2

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