[vdr] Update to 1.7.23.

[Ville Skyttä]

commit b2bfb8965846721b8cf9986e95b94c6a44b85a80
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Jan 15 21:00:49 2012 +0200

    Update to 1.7.23.

 0007-Fix-build-with-g-4.7.0.patch |   25 -------------------------
 sources                           |    3 +--
 vdr.spec                          |   32 ++++++++++++++------------------
 3 files changed, 15 insertions(+), 45 deletions(-)
---
diff --git a/sources b/sources
index a31ac01..6262398 100644
--- a/sources
+++ b/sources
@@ -5,7 +5,6 @@ fae3698214bd45de1f675c2b037d5f3b  vdr-1.7.21-ttxtsubs.patch
 04511ae02243eb1bab94f3f45b59e574  vdr-timer-info-0.5-1.7.13.diff
 71f7281d55eba1957f4267f596b11e29  vdr.epgsearch-exttimeredit-0.0.2.diff
 2b6adcd1e09f009ba12d0fb454e29808  vdr_1.7.20-1.debian.tar.bz2
-b9c0fe1aac8e653c0d0234bc72c2bb2c  vdr-1.7.22.tar.bz2
 612ff95c5f67fffe331c10c0d33340e8  vdr-1.7.22-liemikuutio-1.33.patch.gz
-8d1ecfd83dc6bef54f8263ad25d9186c  vdr-1.7.22-finnish.patch.gz
 925d44ca8a2d10a4b84f1d47e617fc46  vdr-1.7.22-hlcutter-0.2.2.diff
+de136f7be28c4b6f1fa0e2218b4acc11  vdr-1.7.23.tar.bz2
diff --git a/vdr.spec b/vdr.spec
index f2e9c4c..75e6e3a 100644
--- a/vdr.spec
+++ b/vdr.spec
@@ -19,13 +19,13 @@
 %global vdr_user  vdr
 %global vdr_group video
 # From APIVERSION in config.h
-%global apiver    1.7.22
+%global apiver    %{version}
 
 %global migrfile %{_var}/run/systemd-migr_%{name}-%{version}-%{release}.%{_arch}
 
 Name:           vdr
-Version:        1.7.22
-Release:        3%{?dist}
+Version:        1.7.23
+Release:        1%{?dist}
 Summary:        Video Disk Recorder
 
 License:        GPLv2+
@@ -73,15 +73,12 @@ Patch11:        MainMenuHooks-v1_0_1.diff.gz
 # Modified so that it applies over the timer-info patch
 Patch12:        %{name}-1.7.21-timercmd.patch
 Patch13:        http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/plain/patches/vdr-1.5.17-progressbar-support-0.0.1.diff
-Patch14:        http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.7.22-finnish.patch.gz
 Patch15:        %{name}-1.7.21-fedora-pkgconfig.patch
 Patch16:        %{name}-1.7.21-jumpplay-finnish.patch
 Patch17:        http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/plain/patches/vdr.epgsearch-exttimeredit-0.0.2.diff
 Patch18:        %{name}-1.7.22-msgidbugs.patch
 # http://projects.vdr-developer.org/issues/819
 Patch19:        %{name}-1.7.22-ttxtsubs-on.patch
-# Sent upstream 2012-01-04
-Patch20:        0007-Fix-build-with-g-4.7.0.patch
 
 BuildRequires:  libjpeg-devel
 BuildRequires:  libcap-devel
@@ -193,21 +190,19 @@ sed \
 # TODO: does not apply
 #patch6 -p0
 %patch7 -p1 -F 1
-%patch8 -p1
+%patch8 -p1 -F 2
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1 -F 2
 %patch12 -p1
 # TODO: does not apply
 #patch13 -p1
-%patch14 -p1
 %patch15 -p0
 %patch16 -p1
 # TODO: build failure
 #patch17 -p0 -F 3
 %patch18 -p1
 %patch19 -p1
-%patch20 -p1
 
 for f in CONTRIBUTORS HISTORY UPDATE-1.4.0 README.timer-info ; do
   iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
@@ -296,19 +291,17 @@ find srcdoc -type f -size 0 -delete
 
 %install
 
-abs2rel() { perl -MFile::Spec -e 'print File::Spec->abs2rel(@ARGV)' "$@" ; }
-
-install -Dpm 755 vdr $RPM_BUILD_ROOT%{_sbindir}/vdr
+make install-bin install-pc install-doc DESTDIR=$RPM_BUILD_ROOT
 
 install -dm 755 $RPM_BUILD_ROOT%{_bindir}
-install -pm 755 svdrpsend.pl $RPM_BUILD_ROOT%{_bindir}/svdrpsend
-install -pm 755 epg2html $RPM_BUILD_ROOT%{_bindir}/epg2html
+install -pm 755 epg2html $RPM_BUILD_ROOT%{_bindir}
+mv $RPM_BUILD_ROOT%{_sbindir}/svdrpsend $RPM_BUILD_ROOT%{_bindir}
 
-make install-pc DESTDIR=$RPM_BUILD_ROOT
-PKG_CONFIG_PATH=$RPM_BUILD_ROOT%{_libdir}/pkgconfig \
-make install-i18n install-includes install-doc DESTDIR=$RPM_BUILD_ROOT
 install -pm 644 debian/svdrpsend.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
+PKG_CONFIG_PATH=$RPM_BUILD_ROOT%{_libdir}/pkgconfig \
+make install-i18n install-includes DESTDIR=$RPM_BUILD_ROOT
+
 install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins
 install -pm 644 *.conf $RPM_BUILD_ROOT%{configdir}
 
@@ -370,6 +363,8 @@ install -Dpm 644 %{name}.rwtab $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d/%{name}
 
 # devel
 
+abs2rel() { perl -MFile::Spec -e 'print File::Spec->abs2rel(@ARGV)' "$@" ; }
+
 install -pm 755 %{SOURCE9} $RPM_BUILD_ROOT%{_bindir}/vdr-config
 install -pm 755 i18n-to-gettext $RPM_BUILD_ROOT%{_bindir}/vdr-i18n-to-gettext
 install -pm 755 newplugin $RPM_BUILD_ROOT%{_bindir}/vdr-newplugin
@@ -533,7 +528,8 @@ rm -f %{migrfile} &>/dev/null || :
 
 
 %changelog
-* Sat Jan 14 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.7.22-3
+* Sun Jan 15 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.7.23-1
+- Update to 1.7.23.
 - Migrate to systemd.
 - runvdr cleanups.