[vdr-epgsearch] Set SVDRP port to 6419 in scripts and try to migrate config on upgrades if built for VDR >= 1.7.15.

[Ville Skyttä]

commit 45e25db14cde5db9282658e7d29a68e81074a663
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Nov 7 19:27:29 2011 +0200

    Set SVDRP port to 6419 in scripts and try to migrate config on upgrades
    if built for VDR >= 1.7.15.

 vdr-epgsearch-1.0.0-svdrpport-6419.patch |   12 ++++++++++++
 vdr-epgsearch.spec                       |   19 ++++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/vdr-epgsearch-1.0.0-svdrpport-6419.patch b/vdr-epgsearch-1.0.0-svdrpport-6419.patch
new file mode 100644
index 0000000..1df7b10
--- /dev/null
+++ b/vdr-epgsearch-1.0.0-svdrpport-6419.patch
@@ -0,0 +1,12 @@
+diff -up epgsearch-1.0.0/scripts/autotimer2searchtimer.pl~ epgsearch-1.0.0/scripts/autotimer2searchtimer.pl
+--- epgsearch-1.0.0/scripts/autotimer2searchtimer.pl~	2011-09-04 21:33:30.000000000 +0300
++++ epgsearch-1.0.0/scripts/autotimer2searchtimer.pl	2011-11-07 19:09:45.933451004 +0200
+@@ -50,7 +50,7 @@ my $SENDSVDRP		= $opt_s ? 1 : 0;
+ my $EnableRegex		= $opt_r ? 1 : 0;
+ my $Searchmode		= defined $opt_m ? $opt_m : 1;
+ my $Dest		= $opt_d ? $opt_d : "localhost";
+-my $Port		= $opt_p ? $opt_p : 2001;
++my $Port		= $opt_p ? $opt_p : 6419;
+ 
+ my $Timeout = 30; # max. seconds to wait for svdrp  response
+ 
diff --git a/vdr-epgsearch.spec b/vdr-epgsearch.spec
index 29cd9cd..07d2053 100644
--- a/vdr-epgsearch.spec
+++ b/vdr-epgsearch.spec
@@ -1,9 +1,10 @@
 %global pname   epgsearch
 %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.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Powerful schedules menu replacement plugin for VDR
 
 License:        GPLv2+
@@ -16,6 +17,7 @@ Source4:        %{name}-quickepgsearch.conf
 Source5:        %{name}-epgsearchmenu.conf
 # Fedora specific, no need to send upstream
 Patch0:         %{name}-0.9.25.beta21-fedora.patch
+Patch1:         %{name}-1.0.0-svdrpport-6419.patch
 
 BuildRequires:  vdr-devel >= 1.6.0-41
 Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
@@ -30,6 +32,9 @@ reusable queries which can be used as dynamic "search timers" etc.
 %prep
 %setup -q -n %{pname}-%{version}
 sed -e 's|__VARDIR__|%{vdr_vardir}|g' %{PATCH0} | %{__patch} -p1 --fuzz=0
+%if %{svdrpport} == 6419
+%patch1 -p1
+%endif
 
 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
@@ -73,6 +78,14 @@ 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
@@ -87,6 +100,10 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 
 
 %changelog
+* Mon Nov  7 2011 Ville Skyttä <ville.skytta at iki.fi> - 1.0.0-3
+- Set SVDRP port to 6419 in scripts and try to migrate config on upgrades
+  if built for VDR >= 1.7.15.
+
 * Sun Nov  6 2011 Ville Skyttä <ville.skytta at iki.fi> - 1.0.0-2
 - Clean up specfile constructs no longer needed with Fedora or EL6+.