[vdr-skins] Specfile cleanups.

[Ville Skyttä]

commit 672fdf05b205d10437ee1428f7c85e5174f30d7d
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Fri Nov 4 20:44:54 2011 +0200

    Specfile cleanups.

 vdr-skins.spec |   84 ++++++++++++++++++++++++-------------------------------
 1 files changed, 37 insertions(+), 47 deletions(-)
---
diff --git a/vdr-skins.spec b/vdr-skins.spec
index b358c6e..f2b9cff 100644
--- a/vdr-skins.spec
+++ b/vdr-skins.spec
@@ -3,11 +3,6 @@
 # - where has DeepBlue gone?
 # - manage symlinks with alternatives?
 
-%global vardir    %(vdr-config --vardir    2>/dev/null || echo ERROR)
-%global datadir   %(vdr-config --datadir   2>/dev/null || echo ERROR)
-%global vdr_group %(vdr-config --group     2>/dev/null || echo ERROR)
-%global vdr_user  %(vdr-config --user      2>/dev/null || echo ERROR)
-
 Name:           vdr-skins
 Version:        20111104
 Release:        1%{?dist}
@@ -59,7 +54,7 @@ Patch9:         %{name}-egalt2-finnish.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  vdr-devel
+BuildRequires:  vdr-devel >= 1.6.0-41
 BuildRequires:  gettext
 BuildRequires:  hardlink
 Requires:       vdr-text2skin >= 1.3
@@ -156,19 +151,19 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -dm 755 $RPM_BUILD_ROOT%{vardir}/themes
-install -pm 644 *.theme %{SOURCE8} $RPM_BUILD_ROOT%{vardir}/themes/
+install -dm 755 $RPM_BUILD_ROOT%{vdr_vardir}/themes
+install -pm 644 *.theme %{SOURCE8} $RPM_BUILD_ROOT%{vdr_vardir}/themes/
 echo "%%defattr(-,%{vdr_user},%{vdr_group},-)" > %{name}.themes
-find $RPM_BUILD_ROOT%{vardir}/themes -name "*.theme" -size 0 \
+find $RPM_BUILD_ROOT%{vdr_vardir}/themes -name "*.theme" -size 0 \
     -printf "%%%%ghost %%p\n" >> %{name}.themes
-find $RPM_BUILD_ROOT%{vardir}/themes -name "*.theme" ! -size 0 \
+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%{datadir}/text2skin
-cp -pR $(find * -maxdepth 0 -type d) $RPM_BUILD_ROOT%{datadir}/text2skin/
-rm -r $RPM_BUILD_ROOT%{datadir}/text2skin/*/{Makefile,locale,po,*.template}
-rm -r $RPM_BUILD_ROOT%{datadir}/text2skin/anthra_SD/{Make.config,xml}
+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}
 
 for skin in anthra_SD DeepBlue EgalT2 enElchi Enigma ; do
     make -C $skin install-i18n DESTDIR=$RPM_BUILD_ROOT LOCDIR=%{_datadir}/locale
@@ -185,25 +180,19 @@ cat %{name}.lang %{name}.themes > %{name}.files
 rm -rf $RPM_BUILD_ROOT
 
 
-%pre
-# Remove old enElchi/logos symlink so it can be overwritten with a dir
-if [ $1 -gt 1 -a -L %{datadir}/text2skin/enElchi/logos ] ; then
-    rm -f %{datadir}/text2skin/enElchi/logos || :
-fi
-
 %triggerin -- vdr-dxr3
 for l in DeepBlue/{images,logos} Enigma/icons ; do
-    [ -L %{datadir}/text2skin/$l -o ! -e %{datadir}/text2skin/$l ] && \
-    rm -f %{datadir}/text2skin/$l && \
-    ln -s $(basename $l)-dxr3 %{datadir}/text2skin/$l || :
+    [ -L %{vdr_datadir}/text2skin/$l -o ! -e %{vdr_datadir}/text2skin/$l ] && \
+    rm -f %{vdr_datadir}/text2skin/$l && \
+    ln -s $(basename $l)-dxr3 %{vdr_datadir}/text2skin/$l || :
 done
 
 %triggerun -- vdr-dxr3
 if [ $2 -eq 0 ] ; then
     for l in DeepBlue/{images,logos} Enigma/icons ; do
-        [ -L %{datadir}/text2skin/$l -o ! -e %{datadir}/text2skin/$l ] && \
-        rm -f %{datadir}/text2skin/$l && \
-        ln -s $(basename $l)-normal %{datadir}/text2skin/$l || :
+        [ -L %{vdr_datadir}/text2skin/$l -o ! -e %{vdr_datadir}/text2skin/$l ] && \
+        rm -f %{vdr_datadir}/text2skin/$l && \
+        ln -s $(basename $l)-normal %{vdr_datadir}/text2skin/$l || :
     done
 fi
 
@@ -212,41 +201,42 @@ fi
 %defattr(-,root,root,-)
 %doc COPYING* HISTORY.* README.*
 
-%{datadir}/text2skin/Aluminium/
+%{vdr_datadir}/text2skin/Aluminium/
 
-%{datadir}/text2skin/anthra_SD/
+%{vdr_datadir}/text2skin/anthra_SD/
 
-%dir %{datadir}/text2skin/DeepBlue/
-%{datadir}/text2skin/DeepBlue/DeepBlue.*
-%{datadir}/text2skin/DeepBlue/images-*
-%verify(not link) %{datadir}/text2skin/DeepBlue/images
-%{datadir}/text2skin/DeepBlue/logos-*
-%verify(not link) %{datadir}/text2skin/DeepBlue/logos
+%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-*
+%verify(not link) %{vdr_datadir}/text2skin/DeepBlue/logos
 
-%{datadir}/text2skin/EgalSimple/
+%{vdr_datadir}/text2skin/EgalSimple/
 
-%{datadir}/text2skin/EgalsTry/
+%{vdr_datadir}/text2skin/EgalsTry/
 
-%{datadir}/text2skin/EgalT2/
+%{vdr_datadir}/text2skin/EgalT2/
 
-%{datadir}/text2skin/enElchi/
+%{vdr_datadir}/text2skin/enElchi/
 
-%dir %{datadir}/text2skin/Enigma/
-%{datadir}/text2skin/Enigma/Enigma*
-%{datadir}/text2skin/Enigma/hqlogos/
-%{datadir}/text2skin/Enigma/icons-*/
-%verify(not link) %{datadir}/text2skin/Enigma/icons
-%{datadir}/text2skin/Enigma/pics/
-%{datadir}/text2skin/Enigma/symbols/
+%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/
 
-%{datadir}/text2skin/izegrey16/
+%{vdr_datadir}/text2skin/izegrey16/
 
-%{datadir}/text2skin/SilverGreen/
+%{vdr_datadir}/text2skin/SilverGreen/
 
 
 %changelog
 * Fri Nov  4 2011 Ville Skyttä <ville.skytta at iki.fi> - 20111104-1
 - Update anthra_SD to 0.2.9.
+- Specfile cleanups.
 
 * Mon Feb 21 2011 Ville Skyttä <ville.skytta at iki.fi> - 20110221-1
 - Update anthra_SD to 0.2.6; vdrsymbol-fonts is now required.