rpms/lirc/F-11 lirc-0.8.6-standardized-remote-keycodes.patch, NONE, 1.1 lirc.init, 1.4, 1.5 lirc.spec, 1.55, 1.56 lirc.sysconfig, 1.2, 1.3 sources, 1.30, 1.31
Jarod Wilson
jwilson at fedoraproject.org
Mon Sep 14 04:16:31 UTC 2009
- Previous message (by thread): rpms/eric/F-11 .cvsignore, 1.16, 1.17 eric.spec, 1.44, 1.45 sources, 1.23, 1.24
- Next message (by thread): rpms/eric/F-10 .cvsignore, 1.18, 1.19 eric.spec, 1.41, 1.42 sources, 1.23, 1.24
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwilson
Update of /cvs/pkgs/rpms/lirc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14764
Modified Files:
lirc.init lirc.spec lirc.sysconfig sources
Added Files:
lirc-0.8.6-standardized-remote-keycodes.patch
Log Message:
* Sun Sep 13 2009 Jarod Wilson <jarod at redhat.com> 0.8.6-1
- Update to lirc 0.8.6 release
lirc-0.8.6-standardized-remote-keycodes.patch:
adstech/lircd.conf.usbx-707 | 76 ++++-----
animax/lircd.conf.animax | 66 ++++----
apple/lircd.conf.macmini | 12 -
asus/lircd.conf.asus | 56 +++----
asus/lircd.conf.asusdh | 12 -
asus/lircd.conf.digimatrix | 64 ++++----
atiusb/lircd.conf.atilibusb | 104 ++++++-------
atiusb/lircd.conf.atiusb | 84 +++++-----
avermedia/lircd.conf.avermedia | 48 +++---
avermedia/lircd.conf.avermedia98 | 58 +++----
avermedia/lircd.conf.vdomate | 36 ++--
bestbuy/lircd.conf.bestbuy | 50 +++---
bestbuy/lircd.conf.bestbuy2 | 38 ++--
caraca/lircd.conf.caraca | 42 ++---
chronos/lircd.conf.chronos | 50 +++---
cph03x/lircd.conf.cph03x | 46 ++---
creative/lircd.conf.alsa_usb | 54 +++---
creative/lircd.conf.breakoutbox | 52 +++---
creative/lircd.conf.creative | 38 ++--
creative/lircd.conf.livedrive | 56 +++----
dvico/lircd.conf.fusionHDTV | 62 +++----
ea65/lircd.conf.ea65 | 68 ++++----
ericsson/lircd.conf.bte | 44 ++---
hauppauge/lircd.conf.hauppauge | 34 ++--
hercules/lircd.conf.smarttv_stereo | 46 ++---
imon/lircd.conf.imon | 72 ++++-----
imon/lircd.conf.imon-knob | 105 ++++++-------
imon/lircd.conf.imon-pad | 272 +++++++++++++++++------------------
imon/lircd.conf.imon-rsc | 64 ++++----
iodata/lircd.conf.gvbctv5pci | 54 +++---
kanam_accent/lircd.conf.IR-100 | 82 +++++-----
knc_one/lircd.conf.knc_one | 52 +++---
kworld/lircd.conf.kworld | 42 ++---
leadtek/lircd.conf.PVR2000 | 74 ++++-----
leadtek/lircd.conf.RM-0007 | 50 +++---
leadtek/lircd.conf.RM-0010 | 78 +++++-----
life-view/lircd.conf.flyvideo | 58 +++----
logitech/lircd.conf.logitech | 54 +++---
mceusb/lircd.conf.mceusb | 93 ++++++-----
packard_bell/lircd.conf.packard_bell | 50 +++---
pcmak/lircd.conf.pcmak | 112 +++++++-------
pinnacle_systems/lircd.conf.pctv | 70 ++++-----
pixelview/lircd.conf.playtv | 30 +--
pixelview/lircd.conf.playtv_bt878 | 52 +++---
pixelview/lircd.conf.playtv_pro | 34 ++--
pixelview/lircd.conf.remotemaster | 54 +++---
provideo/lircd.conf.pv951 | 32 ++--
remotec/lircd.conf.BW6130 | 28 +--
samsung/lircd.conf.samsung | 98 ++++++------
sasem/lircd.conf.sasem | 64 ++++----
sigma_designs/lircd.conf.realmagic | 64 ++++----
silitek/lircd.conf.silitek | 96 ++++++------
streamzap/lircd.conf.streamzap | 70 ++++-----
technisat/lircd.conf.mediafocusI | 10 -
tekram/lircd.conf.m230 | 46 ++---
vlsystem/lircd.conf.mplay | 86 +++++------
x10/lircd.conf.mouseremote | 62 +++----
x10/lircd.conf.mp3anywhere | 70 ++++-----
58 files changed, 1784 insertions(+), 1790 deletions(-)
--- NEW FILE lirc-0.8.6-standardized-remote-keycodes.patch ---
diff -Naurp lirc-0.8.6/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.6.new/remotes/adstech/lircd.conf.usbx-707
--- lirc-0.8.6/remotes/adstech/lircd.conf.usbx-707 2009-09-13 22:12:44.000000000 -0400
+++ lirc-0.8.6.new/remotes/adstech/lircd.conf.usbx-707 2009-09-13 21:37:03.000000000 -0400
@@ -26,50 +26,50 @@ begin remote
toggle_bit_mask 0x0
begin codes
- Power 0x02FD5BA400
- Mute 0x02FD5FA000
- 1 0x02FD57A800
- 2 0x02FD4FB000
- 3 0x02FD53AC00
- 4 0x02FD56A900
- 5 0x02FD4EB100
- 6 0x02FD5EA100
- 7 0x02FD54AB00
- 8 0x02FD4CB300
- 9 0x02FD5CA300
- Jump 0x02FD55AA00
- 0 0x02FD4DB200
+ KEY_POWER 0x02FD5BA400
+ KEY_MUTE 0x02FD5FA000
+ KEY_1 0x02FD57A800
+ KEY_2 0x02FD4FB000
+ KEY_3 0x02FD53AC00
+ KEY_4 0x02FD56A900
+ KEY_5 0x02FD4EB100
+ KEY_6 0x02FD5EA100
+ KEY_7 0x02FD54AB00
+ KEY_8 0x02FD4CB300
+ KEY_9 0x02FD5CA300
+ Jump 0x02FD55AA00
+ KEY_0 0x02FD4DB200
Search 0x02FD5DA200
- Guide 0x02FD17E800
- Up 0x02FD0FF000
- Menu 0x02FD1FE000
- Left 0x02FD16E900
- Enter 0x02FD0EF100
- Right 0x02FD1EE100
- Info 0x02FD5AA500
- Down 0x02FD46B900
- Exit 0x02FD52AD00
- Replay 0x02FD59A600
- Skip 0x02FD51AE00
- Rewind 0x02FD58A700
- Play 0x02FD44BB00
- Forward 0x02FD50AF00
- Stop 0x02FD07F800
- Record 0x02FD1BE400
+ GUIDE 0x02FD17E800
+ KEY_UP 0x02FD0FF000
+ KEY_MENU 0x02FD1FE000
+ KEY_LEFT 0x02FD16E900
+ KEY_ENTER 0x02FD0EF100
+ KEY_RIGHT 0x02FD1EE100
+ KEY_INFO 0x02FD5AA500
+ KEY_DOWN 0x02FD46B900
+ KEY_EXIT 0x02FD52AD00
+ KEY_AGAIN 0x02FD59A600
+ KEY_NEXT 0x02FD51AE00
+ KEY_REWIND 0x02FD58A700
+ KEY_PLAY 0x02FD44BB00
+ KEY_FORWARD 0x02FD50AF00
+ KEY_STOP 0x02FD07F800
+ KEY_RECORD 0x02FD1BE400
Live 0x02FD13EC00
- A 0x02FD0AF500
- DVD 0x02FD06F900
- B 0x02FD12ED00
+ KEY_A 0x02FD0AF500
+ KEY_DVD 0x02FD06F900
+ KEY_B 0x02FD12ED00
Photo 0x02FD48B700
- Video 0x02FD40BF00
- Music 0x02FD19E600
- Ch+ 0x02FD0BF400
- Ch- 0x02FD08F700
+ KEY_VIDEO 0x02FD40BF00
+ KEY_AUDIO 0x02FD19E600
+ KEY_CHANNELUP 0x02FD0BF400
+ KEY_CHANNELDOWN 0x02FD08F700
S1 0x02FD03FC00
S2 0x02FD01FE00
S3 0x02FD00FF00
- Vol+ 0x02FD15EA00
- Vol- 0x02FD1CE300
+ KEY_VOLUMEUP 0x02FD15EA00
+ KEY_VOLUMEDOWN 0x02FD1CE300
end codes
end remote
diff -Naurp lirc-0.8.6/remotes/animax/lircd.conf.animax lirc-0.8.6.new/remotes/animax/lircd.conf.animax
--- lirc-0.8.6/remotes/animax/lircd.conf.animax 1999-04-29 17:30:59.000000000 -0400
+++ lirc-0.8.6.new/remotes/animax/lircd.conf.animax 2009-09-13 21:37:03.000000000 -0400
@@ -38,79 +38,79 @@ begin remote
begin codes
CD_DOWN 0x000000000000DB24
- CD_UP 0x0000000000005BA4
+ KEY_CD 0x0000000000005BA4
TV_DOWN 0x000000000000DC23
- TV_UP 0x0000000000005CA3
+ KEY_TV 0x0000000000005CA3
PHONE_DOWN 0x000000000000DD22
- PHONE_UP 0x0000000000005DA2
+ KEY_PHONE 0x0000000000005DA2
RADIO_DOWN 0x000000000000DE21
- RADIO_UP 0x0000000000005EA1
+ KEY_RADIO 0x0000000000005EA1
VIDEO_DOWN 0x000000000000DF20
- VIDEO_UP 0x0000000000005FA0
+ KEY_VIDEO 0x0000000000005FA0
AUX1_DOWN 0x000000000000E01F
- AUX1_UP 0x000000000000609F
+ KEY_AUX 0x000000000000609F
MAIL_DOWN 0x000000000000E11E
- MAIL_UP 0x000000000000619E
+ KEY_MAIL 0x000000000000619E
AUX2_DOWN 0x000000000000E21D
AUX2_UP 0x000000000000629D
POWER_DOWN 0x000000000000E31C
- POWER_UP 0x000000000000639C
+ KEY_POWER 0x000000000000639C
LEFT_MOUSE_BUTTON_TOUCH_DOWN 0x000000000000E41B
LEFT_MOUSE_BUTTON_TOUCH_UP 0x000000000000649B
REWIND_DOWN 0x000000000000E51A
- REWIND_UP 0x000000000000659A
+ KEY_REWIND 0x000000000000659A
PLAY_DOWN 0x000000000000E619
- PLAY_UP 0x0000000000006699
+ KEY_PLAY 0x0000000000006699
FORWARD_DOWN 0x000000000000E718
- FORWARD_UP 0x0000000000006798
+ KEY_FORWARD 0x0000000000006798
SKIP_BACKWARD_DOWN 0x000000000000E817
SKIP_BACKWARD 0x0000000000006897
STOP_DOWN 0x000000000000E916
- STOP_UP 0x0000000000006996
+ KEY_STOP 0x0000000000006996
SKIP_FORWARD_DOWN 0x000000000000EA15
SKIP_FORWARD_UP 0x0000000000006A95
CHANNEL_UP_DOWN 0x000000000000EB14
- CHANNEL_UP_UP 0x0000000000006B94
+ KEY_CHANNELUP 0x0000000000006B94
MENU_DOWN 0x000000000000EC13
- MENU_UP 0x0000000000006C93
+ KEY_MENU 0x0000000000006C93
VOLUME_UP_DOWN 0x000000000000ED12
- VOLUME_UP_UP 0x0000000000006D92
+ KEY_VOLUMEUP 0x0000000000006D92
BLUE_BUTTON_DOWN 0x000000000000EE11
- BLUE_BUTTON_UP 0x0000000000006E91
+ KEY_BLUE 0x0000000000006E91
MUTE_DOWN 0x000000000000EF10
- MUTE_UP 0x0000000000006F90
+ KEY_MUTE 0x0000000000006F90
VOLUME_DOWN_DOWN 0x000000000000F00F
- VOLUME_DOWN_UP 0x000000000000708F
+ KEY_VOLUMEDOWN 0x000000000000708F
RED_BUTTON_DOWN 0x000000000000F10E
- RED_BUTTON_UP 0x000000000000718E
+ KEY_RED 0x000000000000718E
GREEN_BUTTON_DOWN 0x000000000000F20D
- GREEN_BUTTON_UP 0x000000000000728D
+ KEY_GREEN 0x000000000000728D
CHANNEL_DOWN_DOWN 0x000000000000F30C
- CHANNEL_DOWN_UP 0x000000000000738C
+ KEY_CHANNELDOWN 0x000000000000738C
1_DOWN 0x000000000000F40B
- 1_UP 0x000000000000748B
+ KEY_1 0x000000000000748B
2_DOWN 0x000000000000F50A
- 2_UP 0x000000000000758A
+ KEY_2 0x000000000000758A
3_DOWN 0x000000000000F609
- 3_UP 0x0000000000007689
+ KEY_3 0x0000000000007689
4_DOWN 0x000000000000F708
- 4_UP 0x0000000000007788
+ KEY_4 0x0000000000007788
5_DOWN 0x000000000000F807
- 5_UP 0x0000000000007887
+ KEY_5 0x0000000000007887
6_DOWN 0x000000000000F906
- 6_UP 0x0000000000007986
+ KEY_6 0x0000000000007986
7_DOWN 0x000000000000FA05
- 7_UP 0x0000000000007A85
+ KEY_7 0x0000000000007A85
8_DOWN 0x000000000000FB04
- 8_UP 0x0000000000007B84
+ KEY_8 0x0000000000007B84
9_DOWN 0x000000000000FC03
- 9_UP 0x0000000000007C83
+ KEY_9 0x0000000000007C83
SLASH_DOWN 0x000000000000FD02
- SLASH_UP 0x0000000000007D82
+ KEY_SLASH 0x0000000000007D82
[...4302 lines suppressed...]
+ KEY_8 0x03
+ KEY_9 0x07
+ KEY_0 0x4c
+ KEY_VOLUMEUP 0x0a
+ KEY_VOLUMEDOWN 0x0e
+ KEY_CHANNELUP 0x12
+ KEY_CHANNELDOWN 0x16
+ Guide 0x0f
+ KEY_BACK 0x0b
+ KEY_TV 0x13
+ KEY_OK 0x42
+ KEY_UP 0x19
+ KEY_LEFT 0x54
+ KEY_RIGHT 0x43
+ KEY_DOWN 0x1d
+ Exit_Click 0x1f
+ Task_Quick 0x17
+ Run_DClick 0x1b
+ KEY_REWIND 0x0d
+ KEY_PLAY 0x09
+ KEY_FASTFORWARD 0x15
+ KEY_PREVIOUS 0x1a
+ KEY_STOP 0x01
+ KEY_NEXT 0x1e
+ KEY_PAUSE 0x05
+ KEY_MUTE 0x4a
+ Warp_Mouse 0x47
+ KEY_RECORD 0x11
+ KEY_ZOOM 0x14
+ Detail 0x4b
end codes
end remote
diff -Naurp lirc-0.8.6/remotes/x10/lircd.conf.mouseremote lirc-0.8.6.new/remotes/x10/lircd.conf.mouseremote
--- lirc-0.8.6/remotes/x10/lircd.conf.mouseremote 2005-01-22 05:40:43.000000000 -0500
+++ lirc-0.8.6.new/remotes/x10/lircd.conf.mouseremote 2009-09-13 21:37:03.000000000 -0400
@@ -24,42 +24,42 @@ begin remote
gap 140000
begin codes
- POWER 0x000000000000000F
- PC 0x000000000000002B
+ KEY_POWER 0x000000000000000F
+ KEY_PC 0x000000000000002B
LAST 0x000000000000004F
- CHANUP 0x0000000000000002
- CHANDOWN 0x0000000000000003
- VOLUP 0x0000000000000006
- VOLDOWN 0x0000000000000007
- MUTE 0x0000000000000005
- 1 0x0000000000000041
- 2 0x0000000000000042
- 3 0x0000000000000043
- 4 0x0000000000000044
- 5 0x0000000000000045
- 6 0x0000000000000046
- 7 0x0000000000000047
- 8 0x0000000000000048
- 9 0x0000000000000049
- 0 0x0000000000000040
- ENTER 0x000000000000004a
+ KEY_CHANNELUP 0x0000000000000002
+ KEY_CHANNELDOWN 0x0000000000000003
+ KEY_VOLUMEUP 0x0000000000000006
+ KEY_VOLUMEDOWN 0x0000000000000007
+ KEY_MUTE 0x0000000000000005
+ KEY_1 0x0000000000000041
+ KEY_2 0x0000000000000042
+ KEY_3 0x0000000000000043
+ KEY_4 0x0000000000000044
+ KEY_5 0x0000000000000045
+ KEY_6 0x0000000000000046
+ KEY_7 0x0000000000000047
+ KEY_8 0x0000000000000048
+ KEY_9 0x0000000000000049
+ KEY_0 0x0000000000000040
+ KEY_ENTER 0x000000000000004a
ADOTB 0x000000000000005D
- REWIND 0x000000000000001C
- PLAY 0x000000000000000D
- FFWD 0x000000000000001D
- STOP 0x000000000000000E
- PAUSE 0x000000000000004E
- RECORD 0x00000000000000FF
- ENTER 0x000000000000004A
+ KEY_REWIND 0x000000000000001C
+ KEY_PLAY 0x000000000000000D
+ KEY_FASTFORWARD 0x000000000000001D
+ KEY_STOP 0x000000000000000E
+ KEY_PAUSE 0x000000000000004E
+ KEY_RECORD 0x00000000000000FF
+ KEY_ENTER 0x000000000000004A
LAST 0x000000000000004F
DISP 0x000000000000005C
SHIFT 0x000000000000006B
GUIDE 0x000000000000006D
- SELECT 0x0000000000000093
- PHONE 0x000000000000004B
- WEB 0x000000000000008B
- CD 0x00000000000000AB
- DVD 0x00000000000000CB
+ KEY_SELECT 0x0000000000000093
+ KEY_PHONE 0x000000000000004B
+ KEY_WWW 0x000000000000008B
+ KEY_CD 0x00000000000000AB
+ KEY_DVD 0x00000000000000CB
MOUSE_SLOW_N 0x0000000000000110
MOUSE_SLOW_NNE 0x0000000000000131
MOUSE_SLOW_NE 0x0000000000000111
@@ -110,7 +110,7 @@ begin remote
MOUSE_FAST_NNW 0x0000000000000539
BUTTONR_DOWN 0x0000000000000801
BUTTONL_DOWN 0x0000000000000804
- BUTTON_UP 0x0000000000000800
+ KEY_UP 0x0000000000000800
end codes
end remote
diff -Naurp lirc-0.8.6/remotes/x10/lircd.conf.mp3anywhere lirc-0.8.6.new/remotes/x10/lircd.conf.mp3anywhere
--- lirc-0.8.6/remotes/x10/lircd.conf.mp3anywhere 2007-07-01 03:09:11.000000000 -0400
+++ lirc-0.8.6.new/remotes/x10/lircd.conf.mp3anywhere 2009-09-13 21:37:03.000000000 -0400
@@ -22,43 +22,43 @@ begin remote
gap 140000
begin codes
- POWER 0x00000000000000F0
- PC 0x00000000000000D4
+ KEY_POWER 0x00000000000000F0
+ KEY_PC 0x00000000000000D4
LAST 0x00000000000000F2
- CHANUP 0x0000000000000040
- CHANDOWN 0x00000000000000C0
- VOLUP 0x0000000000000060
- VOLDOWN 0x00000000000000E0
- MUTE 0x00000000000000A0
- ONE 0x0000000000000082
- TWO 0x0000000000000042
- THREE 0x00000000000000C2
- FOUR 0x0000000000000022
- FIVE 0x00000000000000A2
- SIX 0x0000000000000062
- SEVEN 0x00000000000000E2
- EIGHT 0x0000000000000012
- NINE 0x0000000000000092
- ZERO 0x0000000000000002
- ENTER 0x0000000000000052
+ KEY_CHANNELUP 0x0000000000000040
+ KEY_CHANNELDOWN 0x00000000000000C0
+ KEY_VOLUMEUP 0x0000000000000060
+ KEY_VOLUMEDOWN 0x00000000000000E0
+ KEY_MUTE 0x00000000000000A0
+ KEY_1 0x0000000000000082
+ KEY_2 0x0000000000000042
+ KEY_3 0x00000000000000C2
+ KEY_4 0x0000000000000022
+ KEY_5 0x00000000000000A2
+ KEY_6 0x0000000000000062
+ KEY_7 0x00000000000000E2
+ KEY_8 0x0000000000000012
+ KEY_9 0x0000000000000092
+ KEY_0 0x0000000000000002
+ KEY_ENTER 0x0000000000000052
ADOTB 0x00000000000000BA
- A 0x000000000000003A
- B 0x00000000000000D8
- C 0x00000000000000D6
- D 0x00000000000000D4
- MENU 0x00000000000000B6
- EXIT 0x00000000000000C9
- UP 0x00000000000000D5
- DOWN 0x00000000000000D3
- LEFT 0x00000000000000D2
- RIGHT 0x00000000000000D1
- OK 0x0000000000000052
- REWIND 0x0000000000000038
- PLAY 0x00000000000000B0
- FFWD 0x00000000000000B8
- RECORD 0x00000000000000FF
- STOP 0x0000000000000070
- PAUSE 0x0000000000000072
+ KEY_A 0x000000000000003A
+ KEY_B 0x00000000000000D8
+ KEY_C 0x00000000000000D6
+ KEY_D 0x00000000000000D4
+ KEY_MENU 0x00000000000000B6
+ KEY_EXIT 0x00000000000000C9
+ KEY_UP 0x00000000000000D5
+ KEY_DOWN 0x00000000000000D3
+ KEY_LEFT 0x00000000000000D2
+ KEY_RIGHT 0x00000000000000D1
+ KEY_OK 0x0000000000000052
+ KEY_REWIND 0x0000000000000038
+ KEY_PLAY 0x00000000000000B0
+ KEY_FASTFORWARD 0x00000000000000B8
+ KEY_RECORD 0x00000000000000FF
+ KEY_STOP 0x0000000000000070
+ KEY_PAUSE 0x0000000000000072
end codes
end remote
Index: lirc.init
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/F-11/lirc.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lirc.init 23 Jun 2008 18:06:40 -0000 1.4
+++ lirc.init 14 Sep 2009 04:16:25 -0000 1.5
@@ -6,9 +6,9 @@
# description: Enables infrared controls through LIRC.
# processname: lircd
# processname: lircmd
-# config: /etc/lircd.conf
-# config: /etc/lircmd.conf
-# pidfile: /var/run/lircd.pid
+# config: /etc/lirc/lircd.conf
+# config: /etc/lirc/lircmd.conf
+# pidfile: /var/run/lirc/lircd.pid
### BEGIN INIT INFO
# Provides: lirc
Index: lirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/F-11/lirc.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- lirc.spec 30 Aug 2009 04:27:30 -0000 1.55
+++ lirc.spec 14 Sep 2009 04:16:25 -0000 1.56
@@ -14,24 +14,24 @@
%bcond_without portaudio
%bcond_without x
%bcond_with svgalib
-#define pre pre3
+#define pre pre2
Name: lirc
-Version: 0.8.5
-Release: 3%{?pre:.%{pre}}%{?dist}
+Version: 0.8.6
+Release: 1%{?pre:.%{pre}}%{?dist}
Summary: The Linux Infrared Remote Control package
Group: System Environment/Daemons
License: GPLv2+
URL: http://www.lirc.org/
Source0: http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-#Source0: http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
+#Source0: http://www.lirc.org/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
Source1: %{name}.init
Source2: %{name}.sysconfig
Patch0: lirc-use-new-instead-of-conf-as-filename-suffix.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=457273
# http://thread.gmane.org/gmane.comp.hardware.lirc/6884
-Patch1: lirc-0.8.5-standardized-remote-keycodes.patch
+Patch1: lirc-0.8.6-standardized-remote-keycodes.patch
Patch2: lirc-0.8.4-make-remote-names-all-unique.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -136,6 +136,12 @@ for f in remotes/chronos/lircd.conf.chro
iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
done
+# use /dev/lirc0 by default instead of /dev/lirc
+sed -i -e 's|#define DEV_LIRC "lirc"|#define DEV_LIRC "lirc0"|' config.h.in
+
+# use fixed instead of Courier w/xmode2, should be more prevalent on linux boxen
+sed -i -e 's|char.*font1_name.*Courier.*$|char font1_name[]="-misc-fixed-*-r-*-*-12-*-*-*-*-*-iso8859-1";|g' tools/xmode2.c
+
sed -i -e 's|"/lib /usr/lib |"/%{_lib} %{_libdir} |' configure # lib64 rpath
# *cough* I wish there was a good way to disable alsa/portaudio/svgalib...
@@ -202,10 +208,11 @@ rm -rf doc/Makefile* doc/.libs doc/man*
rm -rf contrib/irman2lirc contrib/lirc.* contrib/sendxevent.c
cd ..
-touch $RPM_BUILD_ROOT%{_sysconfdir}/lirc{d,md}.conf
+install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/lirc
+touch $RPM_BUILD_ROOT%{_sysconfdir}/lirc/lirc{d,md}.conf
-install -dm 755 $RPM_BUILD_ROOT/dev
-touch $RPM_BUILD_ROOT/dev/lirc{d,m}
+install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/run/lirc/
+touch $RPM_BUILD_ROOT%{_localstatedir}/run/lirc/lirc{d,m}
rm $RPM_BUILD_ROOT%{_libdir}/liblirc_client.la
@@ -218,6 +225,15 @@ rm -rf $RPM_BUILD_ROOT
%post
/sbin/chkconfig --add lirc
+# If we're upgrading, move config files into their new location, if need be
+if [ $1 -ge 2 ] ; then
+ if [ -e %{_sysconfdir}/lircd.conf -a ! -e %{_sysconfdir}/lirc/lircd.conf ]; then
+ mv %{_sysconfdir}/lircd.conf %{_sysconfdir}/lirc/lircd.conf
+ fi
+ if [ -e %{_sysconfdir}/lircmd.conf -a ! -e %{_sysconfdir}/lirc/lircmd.conf ]; then
+ mv %{_sysconfdir}/lircmd.conf %{_sysconfdir}/lirc/lircmd.conf
+ fi
+fi
%post libs -p /sbin/ldconfig
@@ -233,17 +249,19 @@ fi
%files
%defattr(-,root,root,-)
%doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO
-%ghost %config(noreplace) %{_sysconfdir}/lirc*d.conf
+%ghost %config(noreplace) %{_sysconfdir}/lirc/lirc*d.conf
%config(noreplace) %{_sysconfdir}/sysconfig/lirc
%{_initrddir}/lirc
%{_bindir}/*ir*
%{_bindir}/*mode2
%{_sbindir}/lirc*d
+%dir %{_datadir}/lirc/
%{_datadir}/lirc/
+%dir %{_localstatedir}/run/lirc/
%{_mandir}/man1/*ir*.1*
%{_mandir}/man1/*mode2*.1*
%{_mandir}/man8/lirc*d.8*
-%ghost /dev/lirc*
+%ghost %{_localstatedir}/run/lirc/lirc*
%files libs
%defattr(-,root,root,-)
@@ -265,8 +283,31 @@ fi
%changelog
-* Sun Aug 30 2009 Jarod Wilson <jarod at redhat.com> 0.8.5-3
-- Bump to keep F11 version rpm-newer than F10
+* Sun Sep 13 2009 Jarod Wilson <jarod at redhat.com> 0.8.6-1
+- Update to lirc 0.8.6 release
+
+* Sat Aug 29 2009 Jarod Wilson <jarod at redhat.com> 0.8.6-0.6.pre2
+- Rediff patches so they actually apply still
+
+* Sat Aug 29 2009 Jarod Wilson <jarod at redhat.com> 0.8.6-0.5.pre2
+- Update to lirc 0.8.6pre2
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.6-0.4.pre1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 21 2009 Jarod Wilson <jarod at redhat.com> 0.8.6-0.3.pre1
+- Set up tools to use /dev/lirc0 instead of /dev/lirc by default
+- Set a default font for xmode2 most people actually have (#467339)
+
+* Wed Jun 24 2009 Jarod Wilson <jarod at redhat.com> 0.8.6-0.2.pre1
+- Fix things up so the relocated socket actually works out of the box
+
+* Tue Jun 23 2009 Jarod Wilson <jarod at redhat.com> 0.8.6-0.1.pre1
+- Update to lirc 0.8.6pre1
+- Adds Linux input layer support to lircmd
+- Adds XMP protocol support
+- Moves lircd socket from /dev/ to /var/run/lirc/ and pid file from
+ /var/run/ to /var/run/lirc/
* Thu May 28 2009 Jarod Wilson <jarod at redhat.com> 0.8.5-2
- Update to lirc 0.8.5
Index: lirc.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/F-11/lirc.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lirc.sysconfig 23 Jun 2008 18:06:40 -0000 1.2
+++ lirc.sysconfig 14 Sep 2009 04:16:25 -0000 1.3
@@ -12,7 +12,7 @@ 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.
+# An empty value will use the default /dev/lirc0 device.
LIRC_DEVICE=""
# If "yes", the init script will try to start lircmd(8) too.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lirc/F-11/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources 28 May 2009 17:04:07 -0000 1.30
+++ sources 14 Sep 2009 04:16:25 -0000 1.31
@@ -1 +1 @@
-5a274e4eaff8156b17903c22ea01f506 lirc-0.8.5.tar.bz2
+4ca24da6f5e7c2dcea74878c27a4a3f7 lirc-0.8.6.tar.bz2
- Previous message (by thread): rpms/eric/F-11 .cvsignore, 1.16, 1.17 eric.spec, 1.44, 1.45 sources, 1.23, 1.24
- Next message (by thread): rpms/eric/F-10 .cvsignore, 1.18, 1.19 eric.spec, 1.41, 1.42 sources, 1.23, 1.24
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list