[vdr-epgsearch] Update to 1.0.1.beta2.
Ville Skyttä
scop at fedoraproject.org
Tue Jun 12 19:34:02 UTC 2012
commit 69cd4281a3cc15bda05310fffe91e2ee63fcb1c6
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Tue Jun 12 22:33:54 2012 +0300
Update to 1.0.1.beta2.
- Drop SVDRP port migration scriptlet.
...ssume-svdrpsend-is-in-PATH-in-all-scripts.patch | 85 ++++++++++
vdr-epgsearch-1.0.0-svdrpport-6419.patch | 12 --
vdr-epgsearch-1.0.1.beta1-fedora.patch | 177 --------------------
vdr-epgsearch-1.0.1.beta2-fedora.patch | 82 +++++++++
vdr-epgsearch.spec | 28 ++--
5 files changed, 178 insertions(+), 206 deletions(-)
---
diff --git a/0001-Assume-svdrpsend-is-in-PATH-in-all-scripts.patch b/0001-Assume-svdrpsend-is-in-PATH-in-all-scripts.patch
new file mode 100644
index 0000000..d75e5f5
--- /dev/null
+++ b/0001-Assume-svdrpsend-is-in-PATH-in-all-scripts.patch
@@ -0,0 +1,85 @@
+From 7dc5de3315f16c453ca18608304cf8477f563667 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
+Date: Tue, 12 Jun 2012 19:19:39 +0300
+Subject: [PATCH] Assume svdrpsend is in $PATH in all scripts.
+
+---
+ scripts/epg2autotimer.sh | 2 +-
+ scripts/epg2taste.sh | 2 +-
+ scripts/mtdone2epgsearchdone.sh | 4 ++--
+ scripts/recordingdone.sh | 4 ++--
+ scripts/timerrep.sh | 2 +-
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/scripts/epg2autotimer.sh b/scripts/epg2autotimer.sh
+index 524720b..bc1c981 100755
+--- a/scripts/epg2autotimer.sh
++++ b/scripts/epg2autotimer.sh
+@@ -11,7 +11,7 @@
+
+ # CONFIG START
+ AUTOTIMER_FILE="$SOURCEDIR/vdradmin/vdradmind.at"
+- SVDRPSEND=/usr/local/bin/svdrpsend
++ SVDRPSEND=svdrpsend
+
+ # default autotimer settings
+ STATUS=1 # 0 = inactive (by default) / 1 = active
+diff --git a/scripts/epg2taste.sh b/scripts/epg2taste.sh
+index 575b2c3..516c22e 100755
+--- a/scripts/epg2taste.sh
++++ b/scripts/epg2taste.sh
+@@ -9,7 +9,7 @@
+
+ # CONFIG START
+ TASTE_FILE="/etc/vdr/plugins/taste.conf"
+- SVDRPSEND=/usr/local/bin/svdrpsend
++ SVDRPSEND=svdrpsend
+
+ # default taste settings
+ REGULAR_EXPRESSION=0 # Regular Expression / Regulärer Ausdruck
+diff --git a/scripts/mtdone2epgsearchdone.sh b/scripts/mtdone2epgsearchdone.sh
+index 00d7ecb..f3513a9 100755
+--- a/scripts/mtdone2epgsearchdone.sh
++++ b/scripts/mtdone2epgsearchdone.sh
+@@ -22,8 +22,8 @@ ASK_SID=no
+ # What S-ID should be used if no other selected
+ DEFAULT_SID=0
+
+-# adjust the following lines to your path to svdrpsend
+-SVDRPSEND=/usr/local/bin/svdrpsend
++# adjust the following line to your path to svdrpsend
++SVDRPSEND=svdrpsend
+
+ # Home of EPGsearch
+ EPGSEARCH_HOME="/etc/vdr/plugins"
+diff --git a/scripts/recordingdone.sh b/scripts/recordingdone.sh
+index ce88509..6952287 100755
+--- a/scripts/recordingdone.sh
++++ b/scripts/recordingdone.sh
+@@ -56,8 +56,8 @@ DEFAULT_SID=-1
+ # Use the recording-dir's ctime as recording time?
+ CTIME_FROM_RECORDING=yes
+
+-# adjust the following lines to your path to svdrpsend
+-SVDRPSEND=/usr/local/bin/svdrpsend
++# adjust the following line to your path to svdrpsend
++SVDRPSEND=svdrpsend
+
+ # Home of EPGsearch
+ EPGSEARCH_HOME="/etc/vdr/plugins"
+diff --git a/scripts/timerrep.sh b/scripts/timerrep.sh
+index 691e279..fb1c4f4 100755
+--- a/scripts/timerrep.sh
++++ b/scripts/timerrep.sh
+@@ -16,7 +16,7 @@
+ # your plugins config dir
+ PLUGINCONFDIR=/etc/vdr/plugins/epgsearch
+ # path to svdrpsend
+-SVDRPSEND=/usr/local/src/VDR/svdrpsend
++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
+--
+1.7.10.2
+
diff --git a/vdr-epgsearch-1.0.1.beta2-fedora.patch b/vdr-epgsearch-1.0.1.beta2-fedora.patch
new file mode 100644
index 0000000..46a1035
--- /dev/null
+++ b/vdr-epgsearch-1.0.1.beta2-fedora.patch
@@ -0,0 +1,82 @@
+diff -up epgsearch-1.0.1.beta2/epgsearch.c~ epgsearch-1.0.1.beta2/epgsearch.c
+--- epgsearch-1.0.1.beta2/epgsearch.c~ 2012-06-11 20:01:54.000000000 +0300
++++ epgsearch-1.0.1.beta2/epgsearch.c 2012-06-12 22:20:38.740086339 +0300
+@@ -446,16 +446,16 @@ bool cPluginEpgsearch::Start(void)
+ LoadConfD();
+ LoadUserVars();
+
+- ChannelGroups.Load(AddDirectory(CONFIGDIR, "epgsearchchangrps.conf"), true);
+- Blacklists.Load(AddDirectory(CONFIGDIR, "epgsearchblacklists.conf"));
+- SearchExts.Load(AddDirectory(CONFIGDIR, "epgsearch.conf"));
+- SearchTemplates.Load(AddDirectory(CONFIGDIR, "epgsearchtemplates.conf"));
+- RecsDone.Load(AddDirectory(CONFIGDIR, "epgsearchdone.data"));
+- SwitchTimers.Load(AddDirectory(CONFIGDIR, "epgsearchswitchtimers.conf"));
+- NoAnnounces.Load(AddDirectory(CONFIGDIR, "noannounce.conf"));
+- DefTimerCheckModes.Load(AddDirectory(CONFIGDIR, "deftimerchkmodes.conf"));
+- TimersDone.Load(AddDirectory(CONFIGDIR, "timersdone.conf"));
+- PendingNotifications.Load(AddDirectory(CONFIGDIR, "pendingnotifications.conf"));
++ ChannelGroups.Load("__VARDIR__/epgsearch/epgsearchchangrps.conf", true);
++ Blacklists.Load("__VARDIR__/epgsearch/epgsearchblacklists.conf");
++ SearchExts.Load("__VARDIR__/epgsearch/epgsearch.conf");
++ SearchTemplates.Load("__VARDIR__/epgsearch/epgsearchtemplates.conf");
++ RecsDone.Load("__VARDIR__/epgsearch/epgsearchdone.data");
++ SwitchTimers.Load("__VARDIR__/epgsearch/epgsearchswitchtimers.conf");
++ NoAnnounces.Load("__VARDIR__/epgsearch/noannounce.conf");
++ DefTimerCheckModes.Load("__VARDIR__/epgsearch/deftimerchkmodes.conf");
++ TimersDone.Load("__VARDIR__/epgsearch/timersdone.conf");
++ PendingNotifications.Load("__VARDIR__/epgsearch/pendingnotifications.conf");
+
+ cSearchTimerThread::Init(this);
+ cSwitchTimerThread::Init();
+diff -up epgsearch-1.0.1.beta2/epgsearchcfg.c~ epgsearch-1.0.1.beta2/epgsearchcfg.c
+--- epgsearch-1.0.1.beta2/epgsearchcfg.c~ 2012-06-11 19:43:52.000000000 +0300
++++ epgsearch-1.0.1.beta2/epgsearchcfg.c 2012-06-12 22:20:39.169055465 +0300
+@@ -80,7 +80,7 @@ cEPGSearchConfig::cEPGSearchConfig(void)
+ strcpy(MailAuthUser, "");
+ strcpy(MailAuthPass, "");
+ strcpy(LastMailConflicts, "");
+- mailViaScript = 1;
++ mailViaScript = 0;
+ manualTimerCheckDefault = 0;
+ noAnnounceWhileReplay = 0;
+ TimerProgRepeat = 0;
+diff -up epgsearch-1.0.1.beta2/scripts/recordingdone.sh~ epgsearch-1.0.1.beta2/scripts/recordingdone.sh
+--- epgsearch-1.0.1.beta2/scripts/recordingdone.sh~ 2012-06-12 22:19:28.570878733 +0300
++++ epgsearch-1.0.1.beta2/scripts/recordingdone.sh 2012-06-12 22:20:39.536029167 +0300
+@@ -60,10 +60,10 @@ CTIME_FROM_RECORDING=yes
+ 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-1.0.1.beta2/scripts/recrep.sh~ epgsearch-1.0.1.beta2/scripts/recrep.sh
+--- epgsearch-1.0.1.beta2/scripts/recrep.sh~ 2012-06-11 19:43:51.000000000 +0300
++++ epgsearch-1.0.1.beta2/scripts/recrep.sh 2012-06-12 22:20:39.914002061 +0300
+@@ -15,7 +15,7 @@
+ # adjust the following lines to your config
+
+ # your plugins config dir
+-PLUGINCONFDIR=/var/lib/vdr/plugins/epgsearch
++PLUGINCONFDIR=/etc/vdr/plugins/epgsearch
+ # path to svdrpsend
+ SVDRPSEND=svdrpsend
+ # the key used to call epgsearch
+diff -up epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh~ epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh
+--- epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh~ 2012-06-11 19:43:51.000000000 +0300
++++ epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh 2012-06-12 22:20:40.723944345 +0300
+@@ -15,7 +15,7 @@
+ #<Configuration>
+
+ # Your timers.conf
+-TIMERS="/video/timers.conf"
++TIMERS="/etc/vdr/timers.conf"
+
+ #</Configuration>
+
diff --git a/vdr-epgsearch.spec b/vdr-epgsearch.spec
index d228d64..bd92855 100644
--- a/vdr-epgsearch.spec
+++ b/vdr-epgsearch.spec
@@ -1,7 +1,6 @@
%global pname epgsearch
-%global beta .beta1
+%global beta .beta2
%global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$
-%global svdrpport %(pkg-config --atleast-version 1.7.15 vdr && echo 6419 || echo 2001)
Name: vdr-%{pname}
Version: 1.0.1
@@ -17,8 +16,9 @@ Source3: %{name}-conflictcheckonly.conf
Source4: %{name}-quickepgsearch.conf
Source5: %{name}-epgsearchmenu.conf
# Fedora specific, no need to send upstream
-Patch0: %{name}-1.0.1.beta1-fedora.patch
-Patch1: %{name}-1.0.0-svdrpport-6419.patch
+Patch0: %{name}-1.0.1.beta2-fedora.patch
+# Sent upstream 2012-06-12
+Patch1: 0001-Assume-svdrpsend-is-in-PATH-in-all-scripts.patch
BuildRequires: vdr-devel >= 1.6.0-41
Requires: vdr(abi)%{?_isa} = %{vdr_apiversion}
@@ -32,10 +32,8 @@ reusable queries which can be used as dynamic "search timers" etc.
%prep
%setup -q -n %{pname}-%{version}%{?beta}
-sed -e 's|__VARDIR__|%{vdr_vardir}|g' %{PATCH0} | %{__patch} -p1 --fuzz=0
-%if %{svdrpport} == 6419
%patch1 -p1
-%endif
+sed -e 's|__VARDIR__|%{vdr_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
@@ -45,8 +43,8 @@ chmod -x scripts/*
%build
-make %{?_smp_mflags} AUTOCONFIG= LIBDIR=. LOCALEDIR=./locale \
- VDRDIR=%{_libdir}/vdr all docs
+make %{?_smp_mflags} AUTOCONFIG=0 LIBDIR=. LOCALEDIR=./locale \
+ VDRDIR=%{_libdir}/vdr all
%install
@@ -79,14 +77,6 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
%find_lang %{name} --all-name --with-man
-%if %{svdrpport} == 6419
-%post
-[ $1 -gt 1 ] && [ -s %{vdr_configdir}/setup.conf ] && \
- sed -i -e 's/^epgsearch\.SVDRPPort = 2001$/epgsearch.SVDRPPort = 6419/' \
- %{vdr_configdir}/setup.conf || :
-%endif
-
-
%files -f %{name}.lang
%doc COPYING HISTORY conf/ scripts/
%lang(de) %doc HISTORY.DE
@@ -101,6 +91,10 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
%changelog
+* Tue Jun 12 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.0.1-0.1.beta2
+- Update to 1.0.1.beta2.
+- Drop SVDRP port migration scriptlet.
+
* Fri May 11 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.0.1-0.1.beta1
- Update to 1.0.1.beta1.
More information about the scm-commits
mailing list