[vdr-epgsearch] - Update to 0.9.25.beta18. - Patch example scripts to match default Fedora config better.

Ville Skyttä scop at fedoraproject.org
Wed Jan 5 21:03:13 UTC 2011 

commit 3914d41365511458343c141488b3c6bdcb11f3c6
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Jan 5 23:02:55 2011 +0200

    - Update to 0.9.25.beta18.
    - Patch example scripts to match default Fedora config better.

 .gitignore                               |    2 +-
 sources                                  |    2 +-
 vdr-epgsearch-0.9.25.beta15-fedora.patch |  144 ++++++++++++++++++++++++++++++
 vdr-epgsearch.spec                       |    8 ++-
 4 files changed, 152 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a5bb73e..d291674 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-vdr-epgsearch-0.9.25.beta17.tgz
+/vdr-epgsearch-0.9.25.beta18.tgz
diff --git a/sources b/sources
index 4d9f350..65a60af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e5169b0a390e8f225d32915604bd2bab  vdr-epgsearch-0.9.25.beta17.tgz
+12cadade4f8f48b45446d3ff3b76f52a  vdr-epgsearch-0.9.25.beta18.tgz
diff --git a/vdr-epgsearch-0.9.25.beta15-fedora.patch b/vdr-epgsearch-0.9.25.beta15-fedora.patch
index 5eb3aaa..49182e4 100644
--- a/vdr-epgsearch-0.9.25.beta15-fedora.patch
+++ b/vdr-epgsearch-0.9.25.beta15-fedora.patch
@@ -49,3 +49,147 @@ diff -up epgsearch-0.9.25.beta15/epgsearchcfg.c~ epgsearch-0.9.25.beta15/epgsear
    manualTimerCheckDefault = 0;
    noAnnounceWhileReplay = 0;
    TimerProgRepeat = 0;
+diff -up epgsearch-0.9.25.beta18/scripts/epg2autotimer.sh~ epgsearch-0.9.25.beta18/scripts/epg2autotimer.sh
+--- epgsearch-0.9.25.beta18/scripts/epg2autotimer.sh~	2010-09-19 21:01:57.000000000 +0300
++++ epgsearch-0.9.25.beta18/scripts/epg2autotimer.sh	2011-01-05 18:54:34.077818589 +0200
+@@ -27,6 +27,6 @@ echo "Done..."
+ 
+ # jump back
+ at now <<EOF
+-perl -l -e "printf \"\n/usr/local/bin/svdrpsend.pl HITK BACK\" x 2" | sh
++perl -l -e "printf \"\nsvdrpsend HITK BACK\" x 2" | sh
+ EOF
+ 
+diff -up epgsearch-0.9.25.beta18/scripts/epg2taste.sh~ epgsearch-0.9.25.beta18/scripts/epg2taste.sh
+--- epgsearch-0.9.25.beta18/scripts/epg2taste.sh~	2010-09-19 21:01:57.000000000 +0300
++++ epgsearch-0.9.25.beta18/scripts/epg2taste.sh	2011-01-05 18:54:26.991817959 +0200
+@@ -21,6 +21,6 @@ echo "Done..."
+ 
+ # jump back
+ at now <<EOF
+-perl -l -e "printf \"\n/usr/local/bin/svdrpsend.pl HITK BACK\" x 2" | sh
++perl -l -e "printf \"\nsvdrpsend HITK BACK\" x 2" | sh
+ EOF
+ 
+diff -up epgsearch-0.9.25.beta18/scripts/mtdone2epgsearchdone.sh~ epgsearch-0.9.25.beta18/scripts/mtdone2epgsearchdone.sh
+--- epgsearch-0.9.25.beta18/scripts/mtdone2epgsearchdone.sh~	2010-09-19 21:01:57.000000000 +0300
++++ epgsearch-0.9.25.beta18/scripts/mtdone2epgsearchdone.sh	2011-01-05 18:54:14.347819499 +0200
+@@ -23,7 +23,7 @@ ASK_SID=no
+ DEFAULT_SID=0
+ 
+ # adjust the following lines to your path to svdrpsend.pl
+-SVDRPSEND=/usr/local/bin/svdrpsend.pl
++SVDRPSEND=svdrpsend
+ 
+ # Home of EPGsearch
+ EPGSEARCH_HOME="/etc/vdr/plugins"
+diff -up epgsearch-0.9.25.beta18/scripts/recordingdone.sh~ epgsearch-0.9.25.beta18/scripts/recordingdone.sh
+--- epgsearch-0.9.25.beta18/scripts/recordingdone.sh~	2010-09-19 21:01:57.000000000 +0300
++++ epgsearch-0.9.25.beta18/scripts/recordingdone.sh	2011-01-05 19:01:13.736820928 +0200
+@@ -57,13 +57,13 @@ DEFAULT_SID=-1
+ CTIME_FROM_RECORDING=yes
+ 
+ # adjust the following lines to your path to svdrpsend.pl
+-SVDRPSEND=/usr/local/bin/svdrpsend.pl
++SVDRPSEND=svdrpsend
+ 
+ # Home of EPGsearch
+-EPGSEARCH_HOME="/etc/vdr/plugins"
++EPGSEARCH_HOME="__VARDIR__/epgsearch"
+ 
+ # Video root
+-VIDEO_ROOT="/video"
++VIDEO_ROOT="/var/lib/vdr/video"
+ 
+ # do not edit below this line
+ #------------------------------------------------------------------------------
+diff -up epgsearch-0.9.25.beta18/scripts/recrep.sh~ epgsearch-0.9.25.beta18/scripts/recrep.sh
+--- epgsearch-0.9.25.beta18/scripts/recrep.sh~	2010-09-19 21:01:57.000000000 +0300
++++ epgsearch-0.9.25.beta18/scripts/recrep.sh	2011-01-05 18:59:37.395821503 +0200
+@@ -11,11 +11,11 @@
+ 
+ # adjust the following lines to your config
+ # your video dir
+-VIDEODIR=/video
++VIDEODIR=/var/lib/vdr/video
+ # your plugins config dir
+-PLUGINCONFDIR=/video/plugins/epgsearch
++PLUGINCONFDIR=/etc/vdr/plugins/epgsearch
+ # path to svdrpsend.pl
+-SVDRPSEND=/usr/local/src/VDR/svdrpsend.pl
++SVDRPSEND=svdrpsend
+ # if you are using special subfolders for some recordings, please add them here
+ FOLDERS="docu,series,magazines"
+ # the key used to call epgsearch
+diff -up epgsearch-0.9.25.beta18/scripts/rememberevent.sh~ epgsearch-0.9.25.beta18/scripts/rememberevent.sh
+--- epgsearch-0.9.25.beta18/scripts/rememberevent.sh~	2010-09-19 21:01:57.000000000 +0300
++++ epgsearch-0.9.25.beta18/scripts/rememberevent.sh	2011-01-05 18:53:45.312817633 +0200
+@@ -36,16 +36,16 @@ case $1 in
+         secs=$(($3-$MINSBEFORE*60))
+         secs_now=`date +%s`
+         if [ $secs -le $secs_now ]; then
+-            echo "svdrpsend.pl MESG '$2 already runs!' >/dev/null" | at now
++            echo "svdrpsend MESG '$2 already runs!' >/dev/null" | at now
+         else
+             if [ -z "$(find $ATD_SPOOL -exec grep -qs "^$entry$" \{} \; -exec rm -v \{} \;)" ]; then
+                 at $(date -d "1970-01-01 $FORMAT $secs seconds" +"%H:%M %m/%d/%Y") <<EOT
+-                svdrpsend.pl MESG '${switch_time#* }: $2' >/dev/null
++                svdrpsend MESG '${switch_time#* }: $2' >/dev/null
+                 sleep $(($MINSBEFORE*60))s
+                 if [ $1 -eq 1 ] ; then
+-                    svdrpsend.pl CHAN $5 >/dev/null
++                    svdrpsend CHAN $5 >/dev/null
+                 else
+-                    svdrpsend.pl MESG '$2 starts!' >/dev/null
++                    svdrpsend MESG '$2 starts!' >/dev/null
+                 fi
+ $entry
+ EOT
+diff -up epgsearch-0.9.25.beta18/scripts/timercmds-auxinfo.sh~ epgsearch-0.9.25.beta18/scripts/timercmds-auxinfo.sh
+--- epgsearch-0.9.25.beta18/scripts/timercmds-auxinfo.sh~	2010-09-19 21:01:57.000000000 +0300
++++ epgsearch-0.9.25.beta18/scripts/timercmds-auxinfo.sh	2011-01-05 18:57:15.013819800 +0200
+@@ -15,7 +15,7 @@
+ #<Configuration>
+ 
+ # Your timers.conf
+-TIMERS="/video/timers.conf"
++TIMERS="/etc/vdr/timers.conf"
+ 
+ #</Configuration>
+ 
+diff -up epgsearch-0.9.25.beta18/scripts/timereventdone.sh~ epgsearch-0.9.25.beta18/scripts/timereventdone.sh
+--- epgsearch-0.9.25.beta18/scripts/timereventdone.sh~	2011-01-02 10:27:08.000000000 +0200
++++ epgsearch-0.9.25.beta18/scripts/timereventdone.sh	2011-01-05 18:53:28.009819136 +0200
+@@ -16,7 +16,7 @@
+ 
+ # path where epgsearch stores its data
+ CONFDIR="/etc/vdr/plugins/epgsearch"
+-SVDRPSEND="/usr/local/src/VDR/svdrpsend.pl"
++SVDRPSEND="svdrpsend"
+ #</Configuration>
+ 
+ DONEFILE=$CONFDIR/epgsearchdone.data
+diff -up epgsearch-0.9.25.beta18/scripts/timerrep.sh~ epgsearch-0.9.25.beta18/scripts/timerrep.sh
+--- epgsearch-0.9.25.beta18/scripts/timerrep.sh~	2010-09-19 21:01:57.000000000 +0300
++++ epgsearch-0.9.25.beta18/scripts/timerrep.sh	2011-01-05 18:53:16.743819551 +0200
+@@ -16,7 +16,7 @@
+ # your plugins config dir
+ PLUGINCONFDIR=/etc/vdr/plugins/epgsearch
+ # path to svdrpsend.pl
+-SVDRPSEND=/usr/local/src/VDR/svdrpsend.pl
++SVDRPSEND=svdrpsend
+ # if you are using special subfolders for some recordings, please add them here
+ FOLDERS="Comedy,Wissen,Serien,Magazine"
+ # the key used to call epgsearch
+diff -up epgsearch-0.9.25.beta18/scripts/undoneepgsearch.sh~ epgsearch-0.9.25.beta18/scripts/undoneepgsearch.sh
+--- epgsearch-0.9.25.beta18/scripts/undoneepgsearch.sh~	2010-09-19 21:01:57.000000000 +0300
++++ epgsearch-0.9.25.beta18/scripts/undoneepgsearch.sh	2011-01-05 18:53:08.353820241 +0200
+@@ -32,7 +32,7 @@ EPGSEARCHDONE_FILE="/etc/vdr/plugins/epg
+ # Backup epgsearchdone.data before changing it (only once a day)
+ BACKUP=yes
+ 
+-SVDRPSEND=svdrpsend.pl
++SVDRPSEND=svdrpsend
+ 
+ # For some debugging infos, set to yes
+ DEBUG=no
diff --git a/vdr-epgsearch.spec b/vdr-epgsearch.spec
index bfd68ff..4b057f2 100644
--- a/vdr-epgsearch.spec
+++ b/vdr-epgsearch.spec
@@ -4,7 +4,7 @@
 %global vardir    %(vdr-config --vardir     2>/dev/null || echo ERROR)
 %global apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
 %global vdr_user  %(vdr-config --user       2>/dev/null || echo ERROR)
-%global beta      beta17
+%global beta      beta18
 
 Name:           vdr-%{pname}
 Version:        0.9.25
@@ -36,7 +36,7 @@ reusable queries which can be used as dynamic "search timers" etc.
 
 %prep
 %setup -q -n %{pname}-%{version}.%{beta}
-sed -e 's|__VARDIR__|%{vardir}|g' %{PATCH0} | %{__patch} --fuzz=0
+sed -e 's|__VARDIR__|%{vardir}|g' %{PATCH0} | %{__patch} -p1 --fuzz=0
 
 for f in scripts/epgsearchcmds-french.conf conf/epgsearchcats.conf-tvm2vdr* ; do
     iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
@@ -98,6 +98,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jan  5 2011 Ville Skyttä <ville.skytta at iki.fi> - 0.9.25-0.4.beta18
+- Update to 0.9.25.beta18.
+- Patch example scripts to match default Fedora config better.
+
 * Sun Jun 20 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.9.25-0.4.beta17
 - Update to 0.9.25.beta17; "long short text" patch applied upstream.

More information about the scm-commits mailing list