[vdr] Drop build time support for lirc < 0.8.6 default socket location.

[Ville Skyttä]

commit 38ede857c5640a7b087ce4559f9b6e9914161419
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Feb 15 21:33:33 2011 +0200

    Drop build time support for lirc < 0.8.6 default socket location.

 vdr-1.6.0-sky-lirc-device.patch |    2 +-
 vdr.spec                        |   13 +++----------
 2 files changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/vdr-1.6.0-sky-lirc-device.patch b/vdr-1.6.0-sky-lirc-device.patch
index 25dfb20..be600b7 100644
--- a/vdr-1.6.0-sky-lirc-device.patch
+++ b/vdr-1.6.0-sky-lirc-device.patch
@@ -6,7 +6,7 @@ diff -up vdr-1.6.0/PLUGINS/src/sky/Makefile~ vdr-1.6.0/PLUGINS/src/sky/Makefile
  INCLUDES += -I$(VDRDIR)/include
  
 -DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
-+LIRC_DEVICE ?= /dev/lircd
++LIRC_DEVICE ?= /var/run/lirc/lircd
 +DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DLIRC_DEVICE=\"$(LIRC_DEVICE)\"
  
  ### The object files (add further files here):
diff --git a/vdr.spec b/vdr.spec
index 6d49a71..7281d1e 100644
--- a/vdr.spec
+++ b/vdr.spec
@@ -25,12 +25,6 @@
 # From APIVERSION in config.h
 %global apiver    1.6.0
 
-%if "%(rpm -q --qf=%%{VERSION} lirc-devel 2>/dev/null)" >= "0.8.6"
-%global lircsock  /var/run/lirc/lircd
-%else
-%global lircsock  /dev/lircd
-%endif
-
 Name:           vdr
 Version:        1.6.0
 Release:        37%{?dist}
@@ -110,8 +104,6 @@ BuildRequires:  perl(File::Spec)
 BuildRequires:  fontconfig-devel
 BuildRequires:  freetype-devel
 BuildRequires:  gettext
-# lirc-devel just for version checking for socket location
-BuildRequires:  lirc-devel
 %if %{with docs}
 BuildRequires:  doxygen
 BuildRequires:  graphviz
@@ -244,7 +236,7 @@ for f in CONTRIBUTORS HISTORY* UPDATE-1.4.0 README.{jumpplay,timer-info} ; do
   iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
 done
 
-sed -i -e 's|/dev/lircd\b|%{lircsock}|' vdr.1
+sed -i -e 's|/dev/lircd\b|%{_localstatedir}/run/lirc/lircd|' vdr.1
 
 cp -p %{SOURCE5} reccmds.conf
 cp -p %{SOURCE13} timercmds.conf
@@ -301,7 +293,7 @@ CONFDIR      = \$(shell pkg-config vdr --variable=configdir)
 INCLUDEDIR   = \$(shell pkg-config vdr --variable=includedir)
 LIBDIR       = \$(PLUGINLIBDIR)
 
-LIRC_DEVICE  = %{lircsock}
+LIRC_DEVICE  = %{_localstatedir}/run/lirc/lircd
 VDR_USER     = %{vdr_user}
 EOF
 
@@ -539,6 +531,7 @@ fi
 
 %changelog
 * Tue Feb 15 2011 Ville Skyttä <ville.skytta at iki.fi>
+- Drop build time support for lirc < 0.8.6 default socket location.
 - Resurrect channel+epg patch.
 
 * Tue Feb  8 2011 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-37