rpms/lirc/devel lirc.init, 1.3, 1.4 lirc.spec, 1.33, 1.34 lirc.sysconfig, 1.1, 1.2 lirc-add-resume-switch-to-irrecord.patch, 1.1, NONE
Jarod Wilson (jwilson)
fedora-extras-commits at redhat.com
Mon Jun 23 18:07:37 UTC 2008
- Previous message: rpms/perl-Authen-Captcha/F-9 import.log, NONE, 1.1 perl-Authen-Captcha-1.023-taint.patch, NONE, 1.1 perl-Authen-Captcha.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/pyusb/devel import.log, NONE, 1.1 pyusb.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwilson
Update of /cvs/pkgs/rpms/lirc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14892
Modified Files:
lirc.init lirc.spec lirc.sysconfig
Removed Files:
lirc-add-resume-switch-to-irrecord.patch
Log Message:
* Mon Jun 23 2008 Jarod Wilson <jwilson at redhat.com> - 0.8.3-4
- Drop resume switch patch, no longer required
- Add support for config option style used by gnome-lirc-properties (#442341)
Index: lirc.init
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/lirc.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lirc.init 16 Aug 2007 09:16:35 -0000 1.3
+++ lirc.init 23 Jun 2008 18:06:40 -0000 1.4
@@ -30,9 +30,40 @@
lockfile=/var/lock/subsys/lirc
+build_lirc_args ()
+{
+ local LIRC_ARGS="$*"
+
+ # For remote only detection support, we need
+ # LIRC_DEVICE undefined
+ if [ -z "$LIRC_DEVICE" ] ; then
+ for dev in /dev/lirc0; do
+ if [ -c $dev ]; then
+ LIRC_DEVICE="$dev"
+ break
+ fi
+ done
+ fi
+
+ # If we have a LIRC_DEVICE or LIRC_DRIVER defined (either because
+ # no devices were defined, OR if we explicitly did), then
+ # populate LIRC_ARGS
+ if [ ! -z "$LIRC_DEVICE" ] || [ ! -z "$LIRC_DRIVER" ]; then
+ if [ -n "$LIRC_DEVICE" ] && [ "$LIRC_DEVICE" != "none" ]; then
+ LIRC_ARGS="--device=$LIRC_DEVICE $LIRC_ARGS"
+ fi
+ if [ -n "$LIRC_DRIVER" ] && [ "$LIRC_DRIVER" != "none" ]; then
+ LIRC_ARGS="--driver=$LIRC_DRIVER $LIRC_ARGS"
+ fi
+ fi
+ echo $LIRC_ARGS
+}
+
start() {
+ LIRC_ARGS=`build_lirc_args $LIRC_ARGS`
+
echo -n $"Starting infrared remote control daemon ($prog): "
- daemon $exec $LIRCD_OPTIONS
+ daemon $exec $LIRC_ARGS $LIRCD_OPTIONS
retval=$?
echo
status $prog >/dev/null 2>&1
Index: lirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- lirc.spec 2 Jun 2008 18:57:47 -0000 1.33
+++ lirc.spec 23 Jun 2008 18:06:40 -0000 1.34
@@ -18,7 +18,7 @@
Name: lirc
Version: 0.8.3
-Release: 3%{?pre:.%{pre}}%{?dist}
+Release: 4%{?pre:.%{pre}}%{?dist}
Summary: The Linux Infrared Remote Control package
Group: System Environment/Daemons
@@ -31,7 +31,6 @@
Patch0: lirc-0.8.3-remote-includes-directive.patch
Patch1: lirc-0.8.3-validate-transmit-buffer.patch
Patch2: lirc-use-new-instead-of-conf-as-filename-suffix.patch
-Patch3: lirc-add-resume-switch-to-irrecord.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{__perl}
@@ -116,7 +115,6 @@
%patch0 -p1 -b .incl
%patch1 -p1 -b .xbuf
%patch2 -p1 -b .suf
-%patch3 -p1 -b .res
chmod 644 contrib/*
@@ -260,6 +258,10 @@
%changelog
+* Mon Jun 23 2008 Jarod Wilson <jwilson at redhat.com> - 0.8.3-4
+- Drop resume switch patch, no longer required
+- Add support for config option style used by gnome-lirc-properties (#442341)
+
* Mon Jun 02 2008 Jarod Wilson <jwilson at redhat.com> - 0.8.3-3
- Add additional required patches for gnome-lirc-properties (#442248)
- Put remote definitions in their own sub-package (#442328)
Index: lirc.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/devel/lirc.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lirc.sysconfig 5 Dec 2004 23:17:51 -0000 1.1
+++ lirc.sysconfig 23 Jun 2008 18:06:40 -0000 1.2
@@ -1,13 +1,23 @@
# Note: in addition to these parameters, you need to have working -*- sh -*-
# configuration file for lircd (and lircmd if enabled).
-# Options to lircd(8). Typically, at least a remote controller driver
-# ("-H foo") needs to be specified here. Run "/usr/sbin/lircd -H help" to get
-# a listing of supported drivers.
+# Options to lircd(8). Typically, this will be empty, as which driver to use
+# should be specified using the LIRC_DRIVER variable below.
LIRCD_OPTIONS=""
+# The infrared receiver (and/or transmitter) driver to be used by lircd(8),
+# similar to passing "-H driver" to lircd(8).
+# Run "/usr/sbin/lircd -H help" to get a listing of supported drivers.
+LIRC_DRIVER=""
+
+# Which lirc device will be used by lircd(8).
+# This is the same as passing "-d device" to lircd.
+# An empty value will use the default /dev/lirc device.
+LIRC_DEVICE=""
+
# If "yes", the init script will try to start lircmd(8) too.
ENABLE_LIRCMD="no"
# Options to lircmd(8).
LIRCMD_OPTIONS=""
+
--- lirc-add-resume-switch-to-irrecord.patch DELETED ---
- Previous message: rpms/perl-Authen-Captcha/F-9 import.log, NONE, 1.1 perl-Authen-Captcha-1.023-taint.patch, NONE, 1.1 perl-Authen-Captcha.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/pyusb/devel import.log, NONE, 1.1 pyusb.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list