Accepting request 106345 from vdr
- move udev rules files from /etc to /lib - update to version 0.9.0: * Remove mceusb, streamzap, it8x, ene0100 drivers, as they're now redundant with upstream kernel drivers * fix oops unplugging igorplugusb receiver while in use * more error-checking for NULL irctl in various lirc_dev paths * add support for Monueal Moncaso IR to mplay driver * add another PNP device ID to lirc_it87 * drop references to static chardev major number 61, we use dynamic * resync lirc_dev with what was merged in the kernel * reformat code using indent to look more like Linux kernel code * drop explicit support for kernels older than 2.6.18 * adapt to using lirc.h as merged in the upstream linux kernel * non-LONG_IR_CODE option dropped, its been the default for years * use portable type definitions all over the place * drop an old GLIBC work-around for printing 64-bit values * fix timing-specific repeat-after-release issue - drop lirc-0.8.7-lirc_h.diff and lirc-0.8.7-lirc_h_2.diff: fixed upstream - clean spec file with spec-cleaner - build with Igor Cesko receiver and transmitter diode support OBS-URL: https://build.opensuse.org/request/show/106345 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lirc?expand=0&rev=46
This commit is contained in:
commit
4caa83863f
@ -1,208 +0,0 @@
|
||||
From d1672cf6eea5c220d6954cba0e75816e0157e22f Mon Sep 17 00:00:00 2001
|
||||
From: Jarod Wilson <jarod@redhat.com>
|
||||
Date: Tue, 13 Jul 2010 23:03:19 -0400
|
||||
Subject: [PATCH] pull in slightly updated upstreamed lirc.h
|
||||
|
||||
Signed-off-by: Jarod Wilson <jarod@redhat.com>
|
||||
---
|
||||
drivers/lirc.h | 130 ++++++++++++++++++++++++++++----------------------------
|
||||
1 files changed, 65 insertions(+), 65 deletions(-)
|
||||
|
||||
Index: lirc-0.8.7/drivers/lirc.h
|
||||
===================================================================
|
||||
--- lirc-0.8.7.orig/drivers/lirc.h
|
||||
+++ lirc-0.8.7/drivers/lirc.h
|
||||
@@ -1,21 +1,16 @@
|
||||
-/* $Id: lirc.h,v 5.27 2010/05/13 15:45:48 lirc Exp $ */
|
||||
+/*
|
||||
+ * lirc.h - linux infrared remote control header file
|
||||
+ * last modified 2010/06/03 by Jarod Wilson
|
||||
+ */
|
||||
|
||||
#ifndef _LINUX_LIRC_H
|
||||
#define _LINUX_LIRC_H
|
||||
|
||||
-#if defined(__linux__)
|
||||
+#include <linux/types.h>
|
||||
#include <linux/ioctl.h>
|
||||
-#elif defined(_NetBSD_)
|
||||
-#include <sys/ioctl.h>
|
||||
-#elif defined(_CYGWIN_)
|
||||
-#define __USE_LINUX_IOCTL_DEFS
|
||||
-#include <sys/ioctl.h>
|
||||
-#endif
|
||||
|
||||
-/* <obsolete> */
|
||||
#define PULSE_BIT 0x01000000
|
||||
#define PULSE_MASK 0x00FFFFFF
|
||||
-/* </obsolete> */
|
||||
|
||||
#define LIRC_MODE2_SPACE 0x00000000
|
||||
#define LIRC_MODE2_PULSE 0x01000000
|
||||
@@ -38,7 +33,7 @@
|
||||
#define LIRC_IS_FREQUENCY(val) (LIRC_MODE2(val) == LIRC_MODE2_FREQUENCY)
|
||||
#define LIRC_IS_TIMEOUT(val) (LIRC_MODE2(val) == LIRC_MODE2_TIMEOUT)
|
||||
|
||||
-typedef int lirc_t;
|
||||
+#define lirc_t int
|
||||
|
||||
/*** lirc compatible hardware features ***/
|
||||
|
||||
@@ -50,17 +45,13 @@ typedef int lirc_t;
|
||||
#define LIRC_MODE_RAW 0x00000001
|
||||
#define LIRC_MODE_PULSE 0x00000002
|
||||
#define LIRC_MODE_MODE2 0x00000004
|
||||
-/* obsolete: #define LIRC_MODE_CODE 0x00000008 */
|
||||
#define LIRC_MODE_LIRCCODE 0x00000010
|
||||
-/* obsolete: #define LIRC_MODE_STRING 0x00000020 */
|
||||
|
||||
|
||||
#define LIRC_CAN_SEND_RAW LIRC_MODE2SEND(LIRC_MODE_RAW)
|
||||
#define LIRC_CAN_SEND_PULSE LIRC_MODE2SEND(LIRC_MODE_PULSE)
|
||||
#define LIRC_CAN_SEND_MODE2 LIRC_MODE2SEND(LIRC_MODE_MODE2)
|
||||
-/* obsolete: #define LIRC_CAN_SEND_CODE LIRC_MODE2SEND(LIRC_MODE_CODE) */
|
||||
#define LIRC_CAN_SEND_LIRCCODE LIRC_MODE2SEND(LIRC_MODE_LIRCCODE)
|
||||
-/* obsolete: #define LIRC_CAN_SEND_STRING LIRC_MODE2SEND(LIRC_MODE_STRING) */
|
||||
|
||||
#define LIRC_CAN_SEND_MASK 0x0000003f
|
||||
|
||||
@@ -71,9 +62,7 @@ typedef int lirc_t;
|
||||
#define LIRC_CAN_REC_RAW LIRC_MODE2REC(LIRC_MODE_RAW)
|
||||
#define LIRC_CAN_REC_PULSE LIRC_MODE2REC(LIRC_MODE_PULSE)
|
||||
#define LIRC_CAN_REC_MODE2 LIRC_MODE2REC(LIRC_MODE_MODE2)
|
||||
-/* obsolete: #define LIRC_CAN_REC_CODE LIRC_MODE2REC(LIRC_MODE_CODE) */
|
||||
#define LIRC_CAN_REC_LIRCCODE LIRC_MODE2REC(LIRC_MODE_LIRCCODE)
|
||||
-/* obsolete: #define LIRC_CAN_REC_STRING LIRC_MODE2REC(LIRC_MODE_STRING) */
|
||||
|
||||
#define LIRC_CAN_REC_MASK LIRC_MODE2REC(LIRC_CAN_SEND_MASK)
|
||||
|
||||
@@ -95,60 +84,71 @@ typedef int lirc_t;
|
||||
|
||||
/*** IOCTL commands for lirc driver ***/
|
||||
|
||||
-#define LIRC_GET_FEATURES _IOR('i', 0x00000000, unsigned long)
|
||||
+#define LIRC_GET_FEATURES _IOR('i', 0x00000000, __u32)
|
||||
|
||||
-#define LIRC_GET_SEND_MODE _IOR('i', 0x00000001, unsigned long)
|
||||
-#define LIRC_GET_REC_MODE _IOR('i', 0x00000002, unsigned long)
|
||||
-#define LIRC_GET_SEND_CARRIER _IOR('i', 0x00000003, unsigned int)
|
||||
-#define LIRC_GET_REC_CARRIER _IOR('i', 0x00000004, unsigned int)
|
||||
-#define LIRC_GET_SEND_DUTY_CYCLE _IOR('i', 0x00000005, unsigned int)
|
||||
-#define LIRC_GET_REC_DUTY_CYCLE _IOR('i', 0x00000006, unsigned int)
|
||||
-#define LIRC_GET_REC_RESOLUTION _IOR('i', 0x00000007, unsigned int)
|
||||
-
|
||||
-#define LIRC_GET_MIN_TIMEOUT _IOR('i', 0x00000008, lirc_t)
|
||||
-#define LIRC_GET_MAX_TIMEOUT _IOR('i', 0x00000009, lirc_t)
|
||||
-
|
||||
-#define LIRC_GET_MIN_FILTER_PULSE _IOR('i', 0x0000000a, lirc_t)
|
||||
-#define LIRC_GET_MAX_FILTER_PULSE _IOR('i', 0x0000000b, lirc_t)
|
||||
-#define LIRC_GET_MIN_FILTER_SPACE _IOR('i', 0x0000000c, lirc_t)
|
||||
-#define LIRC_GET_MAX_FILTER_SPACE _IOR('i', 0x0000000d, lirc_t)
|
||||
+#define LIRC_GET_SEND_MODE _IOR('i', 0x00000001, __u32)
|
||||
+#define LIRC_GET_REC_MODE _IOR('i', 0x00000002, __u32)
|
||||
+#define LIRC_GET_SEND_CARRIER _IOR('i', 0x00000003, __u32)
|
||||
+#define LIRC_GET_REC_CARRIER _IOR('i', 0x00000004, __u32)
|
||||
+#define LIRC_GET_SEND_DUTY_CYCLE _IOR('i', 0x00000005, __u32)
|
||||
+#define LIRC_GET_REC_DUTY_CYCLE _IOR('i', 0x00000006, __u32)
|
||||
+#define LIRC_GET_REC_RESOLUTION _IOR('i', 0x00000007, __u32)
|
||||
+
|
||||
+#define LIRC_GET_MIN_TIMEOUT _IOR('i', 0x00000008, __u32)
|
||||
+#define LIRC_GET_MAX_TIMEOUT _IOR('i', 0x00000009, __u32)
|
||||
+
|
||||
+#if 0 /* these ioctls are not used at the moment */
|
||||
+#define LIRC_GET_MIN_FILTER_PULSE _IOR('i', 0x0000000a, __u32)
|
||||
+#define LIRC_GET_MAX_FILTER_PULSE _IOR('i', 0x0000000b, __u32)
|
||||
+#define LIRC_GET_MIN_FILTER_SPACE _IOR('i', 0x0000000c, __u32)
|
||||
+#define LIRC_GET_MAX_FILTER_SPACE _IOR('i', 0x0000000d, __u32)
|
||||
+#endif
|
||||
|
||||
/* code length in bits, currently only for LIRC_MODE_LIRCCODE */
|
||||
-#define LIRC_GET_LENGTH _IOR('i', 0x0000000f, unsigned long)
|
||||
-
|
||||
-/* all values set should be reset by the driver when the device is
|
||||
- reopened */
|
||||
+#define LIRC_GET_LENGTH _IOR('i', 0x0000000f, __u32)
|
||||
|
||||
-/* obsolete: drivers only support one mode */
|
||||
-#define LIRC_SET_SEND_MODE _IOW('i', 0x00000011, unsigned long)
|
||||
-/* obsolete: drivers only support one mode */
|
||||
-#define LIRC_SET_REC_MODE _IOW('i', 0x00000012, unsigned long)
|
||||
+#define LIRC_SET_SEND_MODE _IOW('i', 0x00000011, __u32)
|
||||
+#define LIRC_SET_REC_MODE _IOW('i', 0x00000012, __u32)
|
||||
/* Note: these can reset the according pulse_width */
|
||||
-#define LIRC_SET_SEND_CARRIER _IOW('i', 0x00000013, unsigned int)
|
||||
-#define LIRC_SET_REC_CARRIER _IOW('i', 0x00000014, unsigned int)
|
||||
-#define LIRC_SET_SEND_DUTY_CYCLE _IOW('i', 0x00000015, unsigned int)
|
||||
-#define LIRC_SET_REC_DUTY_CYCLE _IOW('i', 0x00000016, unsigned int)
|
||||
-#define LIRC_SET_TRANSMITTER_MASK _IOW('i', 0x00000017, unsigned int)
|
||||
-
|
||||
-/* a value of 0 disables all hardware timeouts and data should be
|
||||
- reported as soon as possible */
|
||||
-#define LIRC_SET_REC_TIMEOUT _IOW('i', 0x00000018, lirc_t)
|
||||
+#define LIRC_SET_SEND_CARRIER _IOW('i', 0x00000013, __u32)
|
||||
+#define LIRC_SET_REC_CARRIER _IOW('i', 0x00000014, __u32)
|
||||
+#define LIRC_SET_SEND_DUTY_CYCLE _IOW('i', 0x00000015, __u32)
|
||||
+#define LIRC_SET_REC_DUTY_CYCLE _IOW('i', 0x00000016, __u32)
|
||||
+#define LIRC_SET_TRANSMITTER_MASK _IOW('i', 0x00000017, __u32)
|
||||
+
|
||||
+/*
|
||||
+ * when a timeout != 0 is set the driver will send a
|
||||
+ * LIRC_MODE2_TIMEOUT data packet, otherwise LIRC_MODE2_TIMEOUT is
|
||||
+ * never sent, timeout is disabled by default
|
||||
+ */
|
||||
+#define LIRC_SET_REC_TIMEOUT _IOW('i', 0x00000018, __u32)
|
||||
+
|
||||
+#if 0 /* these ioctls are not used at the moment */
|
||||
/* 1 enables, 0 disables timeout reports in MODE2 */
|
||||
-#define LIRC_SET_REC_TIMEOUT_REPORTS _IOW('i', 0x00000019, unsigned int)
|
||||
+#define LIRC_SET_REC_TIMEOUT_REPORTS _IOW('i', 0x00000019, __u32)
|
||||
|
||||
-/* pulses shorter than this are filtered out by hardware (software
|
||||
- emulation in lirc_dev/lircd?) */
|
||||
-#define LIRC_SET_REC_FILTER_PULSE _IOW('i', 0x0000001a, lirc_t)
|
||||
-/* spaces shorter than this are filtered out by hardware (software
|
||||
- emulation in lirc_dev/lircd?) */
|
||||
-#define LIRC_SET_REC_FILTER_SPACE _IOW('i', 0x0000001b, lirc_t)
|
||||
-/* if filter cannot be set independently for pulse/space, this should
|
||||
- be used */
|
||||
-#define LIRC_SET_REC_FILTER _IOW('i', 0x0000001c, lirc_t)
|
||||
-
|
||||
-/* if enabled from the next key press on the driver will send
|
||||
- LIRC_MODE2_FREQUENCY packets */
|
||||
-#define LIRC_SET_MEASURE_CARRIER_MODE _IOW('i', 0x0000001d, unsigned int)
|
||||
+/*
|
||||
+ * pulses shorter than this are filtered out by hardware (software
|
||||
+ * emulation in lirc_dev?)
|
||||
+ */
|
||||
+#define LIRC_SET_REC_FILTER_PULSE _IOW('i', 0x0000001a, __u32)
|
||||
+/*
|
||||
+ * spaces shorter than this are filtered out by hardware (software
|
||||
+ * emulation in lirc_dev?)
|
||||
+ */
|
||||
+#define LIRC_SET_REC_FILTER_SPACE _IOW('i', 0x0000001b, __u32)
|
||||
+/*
|
||||
+ * if filter cannot be set independantly for pulse/space, this should
|
||||
+ * be used
|
||||
+ */
|
||||
+#define LIRC_SET_REC_FILTER _IOW('i', 0x0000001c, __u32)
|
||||
+
|
||||
+/*
|
||||
+ * if enabled from the next key press on the driver will send
|
||||
+ * LIRC_MODE2_FREQUENCY packets
|
||||
+ */
|
||||
+#define LIRC_SET_MEASURE_CARRIER_MODE _IOW('i', 0x0000001d, __u32)
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* to set a range use
|
||||
@@ -157,8 +157,8 @@ typedef int lirc_t;
|
||||
* LIRC_SET_REC_DUTY_CYCLE/LIRC_SET_REC_CARRIER with the upper bound
|
||||
*/
|
||||
|
||||
-#define LIRC_SET_REC_DUTY_CYCLE_RANGE _IOW('i', 0x0000001e, unsigned int)
|
||||
-#define LIRC_SET_REC_CARRIER_RANGE _IOW('i', 0x0000001f, unsigned int)
|
||||
+#define LIRC_SET_REC_DUTY_CYCLE_RANGE _IOW('i', 0x0000001e, __u32)
|
||||
+#define LIRC_SET_REC_CARRIER_RANGE _IOW('i', 0x0000001f, __u32)
|
||||
|
||||
#define LIRC_NOTIFY_DECODE _IO('i', 0x00000020)
|
||||
|
@ -1,46 +0,0 @@
|
||||
From 7b8fd7003663aad26c0b5f5f8aa30d0e57b343e3 Mon Sep 17 00:00:00 2001
|
||||
From: Jarod Wilson <jarod@redhat.com>
|
||||
Date: Tue, 13 Jul 2010 23:11:42 -0400
|
||||
Subject: [PATCH 2/2] these ioctl defines are needed by lircd
|
||||
|
||||
Signed-off-by: Jarod Wilson <jarod@redhat.com>
|
||||
---
|
||||
drivers/lirc.h | 4 ----
|
||||
1 files changed, 0 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/lirc.h b/drivers/lirc.h
|
||||
index 9edd0e5..32fcbf3 100644
|
||||
--- a/drivers/lirc.h
|
||||
+++ b/drivers/lirc.h
|
||||
@@ -97,12 +97,10 @@
|
||||
#define LIRC_GET_MIN_TIMEOUT _IOR('i', 0x00000008, __u32)
|
||||
#define LIRC_GET_MAX_TIMEOUT _IOR('i', 0x00000009, __u32)
|
||||
|
||||
-#if 0 /* these ioctls are not used at the moment */
|
||||
#define LIRC_GET_MIN_FILTER_PULSE _IOR('i', 0x0000000a, __u32)
|
||||
#define LIRC_GET_MAX_FILTER_PULSE _IOR('i', 0x0000000b, __u32)
|
||||
#define LIRC_GET_MIN_FILTER_SPACE _IOR('i', 0x0000000c, __u32)
|
||||
#define LIRC_GET_MAX_FILTER_SPACE _IOR('i', 0x0000000d, __u32)
|
||||
-#endif
|
||||
|
||||
/* code length in bits, currently only for LIRC_MODE_LIRCCODE */
|
||||
#define LIRC_GET_LENGTH _IOR('i', 0x0000000f, __u32)
|
||||
@@ -123,7 +121,6 @@
|
||||
*/
|
||||
#define LIRC_SET_REC_TIMEOUT _IOW('i', 0x00000018, __u32)
|
||||
|
||||
-#if 0 /* these ioctls are not used at the moment */
|
||||
/* 1 enables, 0 disables timeout reports in MODE2 */
|
||||
#define LIRC_SET_REC_TIMEOUT_REPORTS _IOW('i', 0x00000019, __u32)
|
||||
|
||||
@@ -148,7 +145,6 @@
|
||||
* LIRC_MODE2_FREQUENCY packets
|
||||
*/
|
||||
#define LIRC_SET_MEASURE_CARRIER_MODE _IOW('i', 0x0000001d, __u32)
|
||||
-#endif
|
||||
|
||||
/*
|
||||
* to set a range use
|
||||
--
|
||||
1.7.1
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e431454f266c4ddc209c3cc84fc506cac6092eb5124b4f3dcc215c8584ea7a39
|
||||
size 832187
|
3
lirc-0.9.0.tar.bz2
Normal file
3
lirc-0.9.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6323afae6ad498d4369675f77ec3dbb680fe661bea586aa296e67f2e2daba4ff
|
||||
size 857286
|
33
lirc.changes
33
lirc.changes
@ -1,3 +1,36 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 21 12:33:55 UTC 2012 - lnussel@suse.de
|
||||
|
||||
- move udev rules files from /etc to /lib
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 20 23:06:04 UTC 2012 - fisiu@opensuse.org
|
||||
|
||||
- update to version 0.9.0:
|
||||
* Remove mceusb, streamzap, it8x, ene0100 drivers, as they're
|
||||
now redundant with upstream kernel drivers
|
||||
* fix oops unplugging igorplugusb receiver while in use
|
||||
* more error-checking for NULL irctl in various lirc_dev paths
|
||||
* add support for Monueal Moncaso IR to mplay driver
|
||||
* add another PNP device ID to lirc_it87
|
||||
* drop references to static chardev major number 61, we use dynamic
|
||||
* resync lirc_dev with what was merged in the kernel
|
||||
* reformat code using indent to look more like Linux kernel code
|
||||
* drop explicit support for kernels older than 2.6.18
|
||||
* adapt to using lirc.h as merged in the upstream linux kernel
|
||||
* non-LONG_IR_CODE option dropped, its been the default for years
|
||||
* use portable type definitions all over the place
|
||||
* drop an old GLIBC work-around for printing 64-bit values
|
||||
* fix timing-specific repeat-after-release issue
|
||||
- drop lirc-0.8.7-lirc_h.diff and lirc-0.8.7-lirc_h_2.diff: fixed
|
||||
upstream
|
||||
- clean spec file with spec-cleaner
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 20 22:49:23 UTC 2012 - fisiu@opensuse.org
|
||||
|
||||
- build with Igor Cesko receiver and transmitter diode support
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 24 10:19:15 UTC 2011 - coolo@suse.com
|
||||
|
||||
|
123
lirc.spec
123
lirc.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package lirc
|
||||
#
|
||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -18,56 +18,58 @@
|
||||
|
||||
|
||||
Name: lirc
|
||||
BuildRequires: alsa-devel libtool xorg-x11-devel
|
||||
BuildRequires: alsa-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: xorg-x11-devel
|
||||
# for hw_atilibusb driver
|
||||
%if 0%suse_version > 1020
|
||||
%if 0%{?suse_version} > 1020
|
||||
BuildRequires: libusb-devel
|
||||
%else
|
||||
BuildRequires: libusb
|
||||
%endif
|
||||
%ifnarch s390 s390x
|
||||
# for hw_i2cuser driver
|
||||
%if 0%suse_version > 1010
|
||||
%if 0%{?suse_version} > 1010
|
||||
BuildRequires: linux-kernel-headers
|
||||
%if 0%suse_version > 1030
|
||||
%if 0%{?suse_version} > 1030
|
||||
# i2c-dev.h now moved to that package
|
||||
BuildRequires: i2c-tools
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
%if 0%suse_version > 1020
|
||||
%if 0%{?suse_version} > 1020
|
||||
BuildRequires: fdupes
|
||||
%endif
|
||||
%if 0%{?snapshot:1}
|
||||
BuildRequires: help2man
|
||||
%endif
|
||||
Url: http://www.lirc.org/
|
||||
License: GPL-2.0+
|
||||
Group: Hardware/Other
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: lirc-64bit
|
||||
%endif
|
||||
#
|
||||
Version: 0.8.7
|
||||
Release: 3
|
||||
PreReq: %fillup_prereq %insserv_prereq
|
||||
Version: 0.9.0
|
||||
Release: 0
|
||||
Summary: Tools for Infrared Receivers
|
||||
Source0: http://downloads.sourceforge.net/project/lirc/LIRC/%version/lirc-%version%{?snapshot:-%snapshot}.tar.bz2
|
||||
License: GPL-2.0+
|
||||
Group: Hardware/Other
|
||||
Source0: http://downloads.sourceforge.net/project/lirc/LIRC/%{version}/lirc-%{version}%{?snapshot:-%snapshot}.tar.bz2
|
||||
Source1: baselibs.conf
|
||||
Source4: rc.lirc
|
||||
Source5: sysconfig.lirc
|
||||
Source6: fix-remote-keys.pl
|
||||
Source8: README.SUSE
|
||||
Source9: 51-lirc.rules
|
||||
Patch0: lirc-0.8.7-lirc_h.diff
|
||||
Patch1: lirc-0.8.7-lirc_h_2.diff
|
||||
# PATCH-FEATURE-UPSTREAM -- lirc config for iMON-PAD remote
|
||||
Patch90: imon2_conf.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Requires: udev
|
||||
Recommends: lirc-remotes
|
||||
Suggests: lirc-kmp
|
||||
Supplements: lirc-kmp
|
||||
Recommends: lirc-remotes
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Requires(pre): %fillup_prereq
|
||||
Requires(pre): %insserv_prereq
|
||||
|
||||
%description
|
||||
LIRC is a package that supports receiving and sending IR signals with
|
||||
@ -76,11 +78,7 @@ and sends IR signals, a mouse daemon that translates IR signals to
|
||||
mouse movements, and a couple of user programs that allow you to
|
||||
control your computer with a remote control.
|
||||
|
||||
|
||||
|
||||
|
||||
%package devel
|
||||
License: GPL-2.0+
|
||||
Summary: LIRC development files
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name} = %{version}
|
||||
@ -94,10 +92,7 @@ and sends IR signals, a mouse daemon that translates IR signals to
|
||||
mouse movements, and a couple of user programs that allow you to
|
||||
control your computer with a remote control.
|
||||
|
||||
|
||||
|
||||
%package remotes
|
||||
License: GPL-2.0+
|
||||
Summary: LIRC remote definitions
|
||||
Group: Hardware/Other
|
||||
# files were in lirc package previously
|
||||
@ -106,9 +101,7 @@ Conflicts: lirc <= 0.8.4
|
||||
%description remotes
|
||||
Collection of LIRC configuration files for various remotes.
|
||||
|
||||
|
||||
%package -n liblirc_client0
|
||||
License: GPL-2.0+
|
||||
Summary: LIRC client library
|
||||
Group: Hardware/Other
|
||||
Recommends: lirc = %{version}
|
||||
@ -119,18 +112,15 @@ Conflicts: lirc <= 0.8.4
|
||||
The LIRC client library. To actually use LIRC the lircd daemon from
|
||||
the 'lirc' package has to be configured and started.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}%{?snapshot:-%snapshot}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch90 -p1
|
||||
cp %{SOURCE8} .
|
||||
#find . -type d -name CVS -print0 | xargs -0 -- rm -rf
|
||||
#find . -name .cvsignore -print0 | xargs -0 -- rm -rf
|
||||
|
||||
%build
|
||||
%if 0%suse_version < 1020
|
||||
%if 0%{?suse_version} < 1020
|
||||
# XXX: hw_i2cuser doesn't build on sles10
|
||||
sed -i -e 's/linux\/i2c-dev\.h/foobarblah.h/' configure.ac
|
||||
%endif
|
||||
@ -144,6 +134,8 @@ CFLAGS="%{optflags}" ./configure \
|
||||
--mandir=%{_mandir} \
|
||||
--libdir=%{_libdir} \
|
||||
--sysconfdir=/etc \
|
||||
--with-igor \
|
||||
--with-transmitter \
|
||||
--with-driver=userspace \
|
||||
--with-port=0x3f8 \
|
||||
--with-irq=4 \
|
||||
@ -166,25 +158,25 @@ fi
|
||||
make -C daemons DESTDIR=%{buildroot} install
|
||||
make -C tools DESTDIR=%{buildroot} install
|
||||
make -C doc DESTDIR=%{buildroot} install
|
||||
mkdir -p %{buildroot}/usr/share/lirc
|
||||
cp -a remotes %{buildroot}/usr/share/lirc
|
||||
mkdir -p %{buildroot}%{_datadir}/lirc
|
||||
cp -a remotes %{buildroot}%{_datadir}/lirc
|
||||
install -d -m 755 %{buildroot}/dev
|
||||
mkdir -p %{buildroot}/var/run/lirc
|
||||
touch %{buildroot}/var/run/lirc/lircd
|
||||
chmod 600 %{buildroot}/var/run/lirc/*
|
||||
mkdir -p %{buildroot}%{_localstatedir}/run/lirc
|
||||
touch %{buildroot}%{_localstatedir}/run/lirc/lircd
|
||||
chmod 600 %{buildroot}%{_localstatedir}/run/lirc/*
|
||||
# lircd init scripts
|
||||
install -d -m 755 %{buildroot}/etc/init.d \
|
||||
%{buildroot}/usr/sbin \
|
||||
%{buildroot}/var/adm/fillup-templates
|
||||
install -m 0755 %{SOURCE4} %{buildroot}/etc/init.d/lirc
|
||||
ln -sf ../../etc/init.d/lirc %{buildroot}/usr/sbin/rclirc
|
||||
install -m 0644 %{SOURCE5} %{buildroot}/var/adm/fillup-templates
|
||||
install -d -m 755 %{buildroot}%{_sysconfdir}/init.d \
|
||||
%{buildroot}%{_sbindir} \
|
||||
%{buildroot}%{_localstatedir}/adm/fillup-templates
|
||||
install -m 0755 %{SOURCE4} %{buildroot}%{_initddir}/lirc
|
||||
ln -sf ../../etc/init.d/lirc %{buildroot}%{_sbindir}/rclirc
|
||||
install -m 0644 %{SOURCE5} %{buildroot}%{_localstatedir}/adm/fillup-templates
|
||||
#
|
||||
# udev stuff
|
||||
install -d -m 755 %{buildroot}/etc/udev/rules.d
|
||||
install -d -m 755 %{buildroot}/lib/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
|
||||
install -m 644 %{SOURCE9} %{buildroot}/lib/udev/rules.d
|
||||
find %{buildroot}%{_datadir}/lirc -perm +111 -type f -print0 | xargs -r -0 chmod a-x
|
||||
#
|
||||
# get rid of libtool file
|
||||
rm -f %{buildroot}%{_libdir}/liblirc_client.la
|
||||
@ -193,39 +185,39 @@ rm -f %{buildroot}%{_libdir}/liblirc_client.la
|
||||
rm contrib/lirc.*
|
||||
#
|
||||
# ghost files
|
||||
install -D -m 644 /dev/null %{buildroot}/etc/lirc/lircd.conf
|
||||
install -D -m 644 /dev/null %{buildroot}/etc/lirc/lircmd.conf
|
||||
install -D -m 644 /dev/null %{buildroot}/etc/lirc/lircrc
|
||||
install -D -m 644 /dev/null %{buildroot}%{_sysconfdir}/lirc/lircd.conf
|
||||
install -D -m 644 /dev/null %{buildroot}%{_sysconfdir}/lirc/lircmd.conf
|
||||
install -D -m 644 /dev/null %{buildroot}%{_sysconfdir}/lirc/lircrc
|
||||
# hide python dependency
|
||||
chmod 644 %{buildroot}%{_bindir}/pronto2lirc
|
||||
#
|
||||
#
|
||||
%if 0%suse_version > 1020
|
||||
%fdupes $RPM_BUILD_ROOT
|
||||
%if 0%{?suse_version} > 1020
|
||||
%fdupes %{buildroot}
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr (-,root,root)
|
||||
%doc ANNOUNCE AUTHORS COPYING ChangeLog NEWS README TODO
|
||||
%doc README.SUSE
|
||||
%doc doc/html doc/images doc/lirc.hwdb doc/lirc.css doc/irxevent.keys
|
||||
%doc doc/html doc/images doc/lirc.hwdb doc/lirc.css doc/irxevent.keys
|
||||
%doc contrib
|
||||
%dir %ghost /var/run/lirc
|
||||
%ghost /var/run/lirc/lircm
|
||||
%ghost /var/run/lirc/lircd
|
||||
%dir %ghost %{_localstatedir}/run/lirc
|
||||
%ghost %{_localstatedir}/run/lirc/lircm
|
||||
%ghost %{_localstatedir}/run/lirc/lircd
|
||||
%attr(0755,root,root)/usr/bin/*
|
||||
/usr/sbin/*
|
||||
/etc/init.d/lirc
|
||||
/var/adm/fillup-templates/sysconfig.lirc
|
||||
%dir /etc/udev
|
||||
%dir /etc/udev/rules.d
|
||||
%config /etc/udev/rules.d/51-lirc.rules
|
||||
%doc %_mandir/man1/*
|
||||
%doc %_mandir/man8/*
|
||||
%dir /etc/lirc
|
||||
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/lirc/lircd.conf
|
||||
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/lirc/lircmd.conf
|
||||
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/lirc/lircrc
|
||||
%{_sbindir}/*
|
||||
%{_sysconfdir}/init.d/lirc
|
||||
%{_localstatedir}/adm/fillup-templates/sysconfig.lirc
|
||||
%dir /lib/udev
|
||||
%dir /lib/udev/rules.d
|
||||
/lib/udev/rules.d/51-lirc.rules
|
||||
%doc %{_mandir}/man1/*
|
||||
%doc %{_mandir}/man8/*
|
||||
%dir %{_sysconfdir}/lirc
|
||||
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) %{_sysconfdir}/lirc/lircd.conf
|
||||
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) %{_sysconfdir}/lirc/lircmd.conf
|
||||
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) %{_sysconfdir}/lirc/lircrc
|
||||
|
||||
%files devel
|
||||
%defattr (-,root,root)
|
||||
@ -266,7 +258,4 @@ done
|
||||
%restart_on_update lirc
|
||||
%{insserv_cleanup}
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%changelog
|
||||
|
Loading…
x
Reference in New Issue
Block a user