[vdradmin-am] Update to 3.6.9.

[Ville Skyttä]

commit 5082a219149e5a20ac12427d0f54c52b80592ba1
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Nov 20 16:05:36 2011 +0200

    Update to 3.6.9.

 sources                         |    2 +-
 vdradmin-am-3.6.8-logging.patch |  113 ---------------------------------------
 vdradmin-am-3.6.8-piddir.patch  |   21 -------
 vdradmin-am.spec                |   23 ++++-----
 4 files changed, 11 insertions(+), 148 deletions(-)
---
diff --git a/sources b/sources
index 320fc6c..fb83a33 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-95809a04838121e4ed81f14fd6448886  vdradmin-am-3.6.8.tar.bz2
+d5cd89325f5a5dca5846a905b17d0bc2  vdradmin-am-3.6.9.tar.bz2
diff --git a/vdradmin-am.spec b/vdradmin-am.spec
index ecf83b2..516e036 100644
--- a/vdradmin-am.spec
+++ b/vdradmin-am.spec
@@ -1,9 +1,9 @@
-%global migrfile %{_var}/run/systemd-migr_%{name}-%{version}-%{release}.%{arch}
+%global migrfile %{_var}/run/systemd-migr_%{name}-%{version}-%{release}.%{_arch}
 %global svdrpport %(pkg-config --atleast-version 1.7.15 vdr && echo 6419 || echo 2001)
 
 Name:           vdradmin-am
-Version:        3.6.8
-Release:        5%{?dist}
+Version:        3.6.9
+Release:        1%{?dist}
 Summary:        Web interface for VDR
 
 # infobox.js is GPLv2, crystal icons LGPLv2+, everything else GPLv2+
@@ -14,13 +14,11 @@ Source1:        vdradmind.service
 Source2:        %{name}-httpd.conf
 Source3:        %{name}.rwtab
 Patch0:         %{name}-3.6.6-config.patch
-# http://projects.vdr-developer.org/git/vdradmin-am.git/commit/?id=9b5f54c
-Patch1:         %{name}-3.6.8-logging.patch
-# http://projects.vdr-developer.org/git/vdradmin-am.git/commit/?id=10e18ae
-Patch2:         %{name}-3.6.8-piddir.patch
 
 BuildArch:      noarch
 BuildRequires:  vdr-devel >= 1.6.0-41
+# vdr for SVDRP port stuff in --config
+BuildRequires:  vdr
 BuildRequires:  perl(CGI)
 BuildRequires:  perl(HTTP::Date)
 BuildRequires:  perl(Locale::gettext)
@@ -42,8 +40,6 @@ to a local or remote VDR install to use this package.
 %prep
 %setup -q
 %patch0
-%patch1 -p1 -F 1
-%patch2 -p1
 %{__perl} -pi -e \
   's|"/video"|"%{vdr_videodir}"| ;
    s|^(\$CONFIG\{VDRCONFDIR\}\s*=\s*")[^"]*(.*)|$1%{vdr_configdir}$2| ;
@@ -62,10 +58,8 @@ install -pm 644 %{SOURCE2} .
    s|/usr/share/vdradmin/template|./template|' \
   vdradmind.pl > vdradmind.tmp
 %{__perl} ./vdradmind.tmp --config < /dev/null
-# Would contain build host name, removed to use runtime default
-sed -i -e /^MAIL_FROM/d vdradmind.conf
-# Fix up SVDRP port (6419 in >= 1.7.15, 2001 in older)
-sed -i -e 's/^VDR_PORT.*/VDR_PORT = %{svdrpport}/' vdradmind.conf
+# Remove vars that have better defaults in vdradmind than what we can set here.
+sed -i -e /^MAIL_FROM/d -e /^RECORDINGS/d vdradmind.conf
 ./make.sh po
 
 
@@ -148,6 +142,9 @@ rm -f %{migrfile} >/dev/null 2>&1 || :
 
 
 %changelog
+* Sun Nov 20 2011 Ville Skyttä <ville.skytta at iki.fi> - 3.6.9-1
+- Update to 3.6.9.
+
 * Mon Nov  7 2011 Ville Skyttä <ville.skytta at iki.fi> - 3.6.8-5
 - Hush debugging leftover output in %%post.