rpms/vdr/F-12 vdr-1.6.0-sky-lirc-device.patch, NONE, 1.1 vdr.spec, 1.49, 1.50

Mon Nov 23 18:14:09 UTC 2009

Author: vpv

Update of /cvs/pkgs/rpms/vdr/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31207

Modified Files:
	vdr.spec 
Added Files:
	vdr-1.6.0-sky-lirc-device.patch 
Log Message:
* Sun Nov 22 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.6.0-29
- Set LIRC_DEVICE to /var/run/lirc/lircd for lirc 0.8.6 and add patch to
  change the sky plugin and vdr.1 man page accordingly (#538604).


vdr-1.6.0-sky-lirc-device.patch:
 Makefile |    3 ++-
 sky.c    |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE vdr-1.6.0-sky-lirc-device.patch ---
diff -up vdr-1.6.0/PLUGINS/src/sky/Makefile~ vdr-1.6.0/PLUGINS/src/sky/Makefile
--- vdr-1.6.0/PLUGINS/src/sky/Makefile~	2008-01-13 15:00:16.000000000 +0200
+++ vdr-1.6.0/PLUGINS/src/sky/Makefile	2009-11-22 22:37:27.000000000 +0200
@@ -41,7 +41,8 @@ PACKAGE = vdr-$(ARCHIVE)
 
 INCLUDES += -I$(VDRDIR)/include
 
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+LIRC_DEVICE ?= /dev/lircd
+DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DLIRC_DEVICE=\"$(LIRC_DEVICE)\"
 
 ### The object files (add further files here):
 
diff -up vdr-1.6.0/PLUGINS/src/sky/sky.c~ vdr-1.6.0/PLUGINS/src/sky/sky.c
--- vdr-1.6.0/PLUGINS/src/sky/sky.c~	2008-03-22 12:19:32.000000000 +0200
+++ vdr-1.6.0/PLUGINS/src/sky/sky.c	2009-11-22 22:33:03.000000000 +0200
@@ -88,7 +88,7 @@ cDigiboxDevice::cDigiboxDevice(void)
   apid = vpid = 0;
   struct sockaddr_un addr;
   addr.sun_family = AF_UNIX;
-  strn0cpy(addr.sun_path, "/dev/lircd", sizeof(addr.sun_path));//XXX parameter???
+  strn0cpy(addr.sun_path, LIRC_DEVICE, sizeof(addr.sun_path));//XXX parameter???
   fd_lirc = socket(AF_UNIX, SOCK_STREAM, 0);
   if (fd_lirc >= 0) {
      if (connect(fd_lirc, (struct sockaddr *)&addr, sizeof(addr)) < 0) {


Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/F-12/vdr.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- vdr.spec	9 Aug 2009 20:16:34 -0000	1.49
+++ vdr.spec	23 Nov 2009 18:14:09 -0000	1.50
@@ -25,15 +25,21 @@
 # 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:        27%{?dist}
+Release:        29%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
 License:        GPLv2+
-URL:            http://www.cadsoft.de/vdr/
-Source0:        ftp://ftp.cadsoft.de/vdr/%{name}-%{version}.tar.bz2
+URL:            http://www.tvdr.de/
+Source0:        ftp://ftp.tvdr.de/vdr/%{name}-%{version}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 # TODO
@@ -78,8 +84,8 @@ Patch14:        %{name}-1.6.0-includes+p
 Patch15:        %{name}-1.6.0-fedora-pkgconfig.patch
 Patch16:        %{name}-1.6.0-dxr3-subtitles.patch
 Patch17:        http://toms-cafe.de/vdr/download/vdr-timer-info-0.5-1.5.15.diff
-Patch18:        ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.6.0-1.diff
-Patch19:        ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.6.0-2.diff
+Patch18:        ftp://ftp.tvdr.de/vdr/Developer/vdr-1.6.0-1.diff
+Patch19:        ftp://ftp.tvdr.de/vdr/Developer/vdr-1.6.0-2.diff
 # From openSUSE's vdr-1.6.0-62.3, fixes build with (broken? #483644) dvb headers
 Patch20:        %{name}-1.6.0-kernel-2.6.29.diff
 Patch21:        http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-subtitles-button.patch.gz
@@ -93,6 +99,8 @@ Patch26:        %{name}-jumpplay-1.0-1.6
 # http://projects.vdr-developer.org/git/?p=vdr-plugin-epgsearch.git;a=blob;f=patches/vdr.epgsearch-exttimeredit-0.0.2.diff
 # Modified so that it applies on top of our other patches
 Patch27:        %{name}-1.6.0-epgsearch-exttimeredit-0.0.2.diff
+# https://bugzilla.redhat.com/show_bug.cgi?id=538604, upstreamed 2009-11-22
+Patch28:        %{name}-1.6.0-sky-lirc-device.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -102,6 +110,8 @@ 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
@@ -221,11 +231,14 @@ sed \
 %patch25 -p1 -F 2
 %patch26 -p1
 %patch27 -p1
+%patch28 -p1
 
 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
+
 cp -p %{SOURCE5} reccmds.conf
 cp -p %{SOURCE13} timercmds.conf
 cp -p %{SOURCE6} commands.conf
@@ -281,6 +294,7 @@ CONFDIR      = \$(shell pkg-config vdr -
 INCLUDEDIR   = \$(shell pkg-config vdr --variable=includedir)
 LIBDIR       = \$(PLUGINLIBDIR)
 
+LIRC_DEVICE  = %{lircsock}
 VDR_USER     = %{vdr_user}
 EOF
 
@@ -543,43 +557,50 @@ fi
 %endif # plugins
 
 %changelog
-* Sun Aug  9 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-27
+* Sun Nov 22 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.6.0-29
+- Set LIRC_DEVICE to /var/run/lirc/lircd for lirc 0.8.6 and add patch to
+  change the sky plugin and vdr.1 man page accordingly (#538604).
+
+* Wed Oct 28 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-28
+- Update URLs to point to tvdr.de.
+
+* Sun Aug  9 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-27
 - Make -docs noarch also when built on EL > 5.
 
-* Sun Jul 26 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-26
+* Sun Jul 26 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-26
 - Provide ISA qualified vdr(abi).  Plugins should depend on (versioned)
   vdr(abi)%%{?_isa} instead of just vdr(abi).
 - Borrow build patch for recent (broken? #483644) DVB headers from openSUSE.
 - Apply epgsearch timer integration patch.
 - Use %%global instead of %%define.
 
-* Mon Jun 22 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-25
+* Mon Jun 22 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-25
 - Make -docs noarch when built on Fedora > 9.
 
-* Mon Jun 15 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-24
+* Mon Jun 15 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-24
 - Update hlcutter patch to 0.2.2, drop no longer needed gcc 4.4 workaround.
 - Resurrect Finnish translation for hlcutter.
 
-* Tue Jun  9 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-23
+* Tue Jun  9 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-23
 - Apply gcc 4.4 build fix from openSUSE and upstream, hlcutter still needs work.
 - Drop no longer needed DVB header workaround.
 
-* Tue May 26 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-22
+* Tue May 26 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-22
 - Quiet usermod, avoid possible extra -v inserted to /etc/sysconfig/vdr on
   upgrades from earlier releases that used to default to /srv/vdr for video.
 - Add jumpplay patch 1.0 and a Finnish translation for it.
 - Update liemikuutio patch to 1.27.
 
-* Sat Apr 18 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-21
+* Sat Apr 18 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-21
 - Use videodir from /etc/sysconfig/vdr if set in vdr-moveto.sh.
 
-* Tue Apr 14 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-20
+* Tue Apr 14 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-20
 - Add ugly workarounds to "fix" build with gcc 4.4 and current DVB headers.
 - Use useradd -N instead of -n in scriptlets (#495731).
 - Include Rolf Ahrenberg's sys_nice and ionice patches.
 - Update liemikuutio patch to 1.25.
 
-* Sat Feb 28 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-19
+* Sat Feb 28 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-19
 - Update liemikuutio patch to 1.24 to fix some issues with gcc 4.4.
 - Apply Rolf Ahrenberg's patch to include audio and subtitles shortcut
   buttons in DVB setup menu.
@@ -587,7 +608,7 @@ fi
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Sat Jan 31 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-17
+* Sat Jan 31 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-17
 - Do not create the video group, require udev >= 136-1 which creates it.
 - Replace ttxtsubs patch with one from new ttxtsubs upstream.
 - Update to re-released liemikuutio 1.21 patch.
@@ -596,27 +617,27 @@ fi
 - Disable kernel DVB API check to fix build, upstream VDR 1.6.0 expects DVB
   API v3 but current Rawhide kernels have v5.
 
-* Sun Nov 23 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-15
+* Sun Nov 23 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-15
 - Reorganize dir structure for better Fedora guidelines compliance (#443706):
   /var/lib/vdr/* -> /var/lib/vdr/data, /srv/video -> /var/lib/vdr/video.
 - Drop audiodir and ownership of /srv/audio, examples still point to it.
 
-* Sat Nov 22 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-8
+* Sat Nov 22 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-8
 - Fix setting wakeup time via rtc0 when hardware clock is localtime.
 - Drop remote plugin examples from udev rules, they're in vdr-remote now.
 
-* Tue Oct 28 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-7
+* Tue Oct 28 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-7
 - Fix setting wakeup time via /proc/acpi/alarm when hardware clock is UTC.
 
-* Thu Sep 25 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-6
+* Thu Sep 25 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-6
 - README.package updates.
 - Specfile micro-cleanups.
 
-* Sun Sep  7 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-5
+* Sun Sep  7 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-5
 - Work around Fedora buildsys not coping with "%%patch -F" (infrastructure
   ticket #817).
 
-* Sun Sep  7 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-4
+* Sun Sep  7 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-4
 - Apply upstream 1.6.0-2 maintenance patch.
 - Update shutdown/wakeup functionality for F-9+ ACPI wakeup.
 - Install halt.local script (vdr-halt.local.sh) instead of embedding it
@@ -625,17 +646,17 @@ fi
 - Convert remaining docs to UTF-8.
 - Set expected fuzz factor when applying patches.
 
-* Sat May 10 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-3
+* Sat May 10 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-3
 - Update liemikuutio patch to 1.21.
 - Change timercmd patch to the one shipped with epgsearch 0.9.24.
 - Include vdr-i18n-to-gettext in -devel.
 - Own (%%ghost) videodir/.update.
 
-* Sun Apr 13 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-2
+* Sun Apr 13 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-2
 - Apply upstream 1.6.0-1 maintenance patch.
 - Update timer info patch to 0.5 (fixes the "±" sign).
 
-* Mon Apr  7 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-1
+* Mon Apr  7 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-1
 - Apply "unofficial" timercmd patch from HoochVDR.
 - Apply Luca Olivetti's DXR3 subtitle compatibility patch.
 - Decrease default wakeup delay before a timed recording to 10 minutes.
@@ -643,21 +664,21 @@ fi
 - Use "kill -HUP" in init script's restart action only on a running service.
 - Update and apply timer-info patch.
 
-* Sun Apr  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-0.4
+* Sun Apr  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-0.4
 - Obsolete vdr-subtitles.
 
-* Fri Apr  4 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-0.3
+* Fri Apr  4 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-0.3
 - Update liemikuutio patch to 1.20.
 - Move various (partially) upstreamable changes to patches instead of
   inlining them in the specfile.
 - Drop unused logdir.
 - Move pre-2008 changelog entries to README.package.old.
 
-* Sat Mar 29 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-0.2
+* Sat Mar 29 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-0.2
 - Add --with docs build option for building a -docs subpackage.
 - Refresh liemikuutio and ttxtsubs patches.
 
-* Sun Mar 23 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-0.1
+* Sun Mar 23 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-0.1
 - 1.6.0 final; still quite a bit to do with the package.
 - Adapt sync early and epgsearch (partially) patches.
 - Fix dependencies of the sky plugin.
@@ -665,28 +686,28 @@ fi
 - Use kill -HUP in init script's restart action.
 - Don't include bundled plugin sysconfig snippets in main package.
 
-* Tue Mar 18 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.5.18-0.1
+* Tue Mar 18 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.5.18-0.1
 - First cut at packaging 1.5.18.
 - Plugin licenses clarified to be GPLv2+.
 
-* Sun Mar 16 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-11
+* Sun Mar 16 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-11
 - Kill runvdr before vdr in init script's "stop" action in order to prevent
   it from restarting vdr in case something goes wrong when shutting down.
 - Direct debug messages from sync early patch to to syslog instead of stderr.
 - Make time to wake up before a timer configurable.
 - Enable shutdown script by default.
 
-* Wed Feb 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-10
+* Wed Feb 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-10
 - Rebuild.
 
-* Sun Feb 17 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-9
+* Sun Feb 17 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-9
 - Don't run "restart" for init script's "reload" action per the LSB spec.
 - runvdr cleanups, handle PLUGIN_ENABLED values case insensitively.
 
-* Thu Feb 14 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-8
+* Thu Feb 14 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-8
 - Patch to fix build with GCC 4.3's cleaned up C++ headers.
 
-* Sat Jan 12 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-7
+* Sat Jan 12 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-7
 - Include Udo Richter's hard link cutter patch v0.2.0 (see README-HLCUTTER).
 - Add some plugins to the default plugin order list in sysconfig.
 - Minor runvdr cleanups.


