[vdr-skins] Adapt to VDR 1.7.30.

[Ville Skyttä]

commit d9403e7744cfc8c6c86aa94a90b293e951533572
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Thu Sep 13 21:21:23 2012 +0300

    Adapt to VDR 1.7.30.

 vdr-skins.spec |   63 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 33 insertions(+), 30 deletions(-)
---
diff --git a/vdr-skins.spec b/vdr-skins.spec
index 20febc1..15f1fc1 100644
--- a/vdr-skins.spec
+++ b/vdr-skins.spec
@@ -5,7 +5,7 @@
 
 Name:           vdr-skins
 Version:        20111105
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Collection of OSD skins for VDR
 
 License:        GPL+
@@ -52,11 +52,11 @@ Patch8:         Aluminium-1.0-demo-fonts.patch
 Patch9:         %{name}-egalt2-finnish.patch
 
 BuildArch:      noarch
-BuildRequires:  vdr-devel >= 1.6.0-41
+BuildRequires:  vdr-devel >= 1.7.30
 BuildRequires:  gettext
 BuildRequires:  hardlink
 Requires:       vdr-text2skin >= 1.3
-Requires:       vdr >= 1.6.0
+Requires:       vdr >= 1.7.30
 # vdrsymbol-fonts for anthra_SD and Enigma, and "Sans Serif" in others
 Requires:       vdrsymbol-fonts
 
@@ -156,10 +156,10 @@ find $RPM_BUILD_ROOT%{vdr_vardir}/themes -name "*.theme" ! -size 0 \
     -print >> %{name}.themes
 %{__perl} -pi -e "s|$RPM_BUILD_ROOT||" %{name}.themes
 
-install -dm 755 $RPM_BUILD_ROOT%{vdr_datadir}/text2skin
-cp -pR $(find * -maxdepth 0 -type d) $RPM_BUILD_ROOT%{vdr_datadir}/text2skin/
-rm -r $RPM_BUILD_ROOT%{vdr_datadir}/text2skin/*/{Makefile,locale,po,*.template}
-rm -r $RPM_BUILD_ROOT%{vdr_datadir}/text2skin/anthra_SD/{Make.config,xml}
+install -dm 755 $RPM_BUILD_ROOT%{vdr_resdir}/text2skin
+cp -pR $(find * -maxdepth 0 -type d) $RPM_BUILD_ROOT%{vdr_resdir}/text2skin/
+rm -r $RPM_BUILD_ROOT%{vdr_resdir}/text2skin/*/{Makefile,locale,po,*.template}
+rm -r $RPM_BUILD_ROOT%{vdr_resdir}/text2skin/anthra_SD/{Make.config,xml}
 
 for skin in anthra_SD DeepBlue EgalT2 enElchi Enigma ; do
     make -C $skin install-i18n DESTDIR=$RPM_BUILD_ROOT LOCDIR=%{_datadir}/locale
@@ -174,17 +174,17 @@ cat %{name}.lang %{name}.themes > %{name}.files
 
 %pre
 # For overwriting a symlink with a dir in 20111105-3...
-dir=%{vdr_datadir}/text2skin/DeepBlue/logos
+dir=%{vdr_resdir}/text2skin/DeepBlue/logos
 [ $1 -gt 1 ] && [ -L $dir ] && rm -rf $(readlink -f $dir) $dir || :
 
 %triggerin -- vdr-dxr3
-for f in %{vdr_datadir}/text2skin/{DeepBlue/images,Enigma/icons} ; do
+for f in %{vdr_resdir}/text2skin/{DeepBlue/images,Enigma/icons} ; do
     [ -L $f -o ! -e $f ] && rm -f $f && ln -s $(basename $f)-dxr3 $f || :
 done
 
 %triggerun -- vdr-dxr3
 [ $2 -ne 0 ] || exit 0
-for f in %{vdr_datadir}/text2skin/{DeepBlue/images,Enigma/icons} ; do
+for f in %{vdr_resdir}/text2skin/{DeepBlue/images,Enigma/icons} ; do
     [ -L $f -o ! -e $f ] && rm -f $f && ln -s $(basename $f)-normal $f || :
 done
 
@@ -192,38 +192,41 @@ done
 %files -f %{name}.files
 %doc COPYING* HISTORY.* README.*
 
-%{vdr_datadir}/text2skin/Aluminium/
+%{vdr_resdir}/text2skin/Aluminium/
 
-%{vdr_datadir}/text2skin/anthra_SD/
+%{vdr_resdir}/text2skin/anthra_SD/
 
-%dir %{vdr_datadir}/text2skin/DeepBlue/
-%{vdr_datadir}/text2skin/DeepBlue/DeepBlue.*
-%{vdr_datadir}/text2skin/DeepBlue/images-*/
-%verify(not link) %{vdr_datadir}/text2skin/DeepBlue/images
-%{vdr_datadir}/text2skin/DeepBlue/logos/
+%dir %{vdr_resdir}/text2skin/DeepBlue/
+%{vdr_resdir}/text2skin/DeepBlue/DeepBlue.*
+%{vdr_resdir}/text2skin/DeepBlue/images-*/
+%verify(not link) %{vdr_resdir}/text2skin/DeepBlue/images
+%{vdr_resdir}/text2skin/DeepBlue/logos/
 
-%{vdr_datadir}/text2skin/EgalSimple/
+%{vdr_resdir}/text2skin/EgalSimple/
 
-%{vdr_datadir}/text2skin/EgalsTry/
+%{vdr_resdir}/text2skin/EgalsTry/
 
-%{vdr_datadir}/text2skin/EgalT2/
+%{vdr_resdir}/text2skin/EgalT2/
 
-%{vdr_datadir}/text2skin/enElchi/
+%{vdr_resdir}/text2skin/enElchi/
 
-%dir %{vdr_datadir}/text2skin/Enigma/
-%{vdr_datadir}/text2skin/Enigma/Enigma*
-%{vdr_datadir}/text2skin/Enigma/hqlogos/
-%{vdr_datadir}/text2skin/Enigma/icons-*/
-%verify(not link) %{vdr_datadir}/text2skin/Enigma/icons
-%{vdr_datadir}/text2skin/Enigma/pics/
-%{vdr_datadir}/text2skin/Enigma/symbols/
+%dir %{vdr_resdir}/text2skin/Enigma/
+%{vdr_resdir}/text2skin/Enigma/Enigma*
+%{vdr_resdir}/text2skin/Enigma/hqlogos/
+%{vdr_resdir}/text2skin/Enigma/icons-*/
+%verify(not link) %{vdr_resdir}/text2skin/Enigma/icons
+%{vdr_resdir}/text2skin/Enigma/pics/
+%{vdr_resdir}/text2skin/Enigma/symbols/
 
-%{vdr_datadir}/text2skin/izegrey16/
+%{vdr_resdir}/text2skin/izegrey16/
 
-%{vdr_datadir}/text2skin/SilverGreen/
+%{vdr_resdir}/text2skin/SilverGreen/
 
 
 %changelog
+* Thu Sep 13 2012 Ville Skyttä <ville.skytta at iki.fi> - 20111105-5
+- Adapt to VDR 1.7.30.
+
 * Tue Jul 17 2012 Ville Skyttä <ville.skytta at iki.fi> - 20111105-4
 - Make sure %%pre scriptlet exits with zero status (#840943).