[vdr-skins] Don't try to symlink to nonexistent DeepBlue/logos-dxr3.

[Ville Skyttä]

commit 51a3ca4c20da1d1e75cedd9d616c68a23dd84428
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Jun 18 00:32:49 2012 +0300

    Don't try to symlink to nonexistent DeepBlue/logos-dxr3.
    
    - Clean up specfile constructs no longer needed with Fedora or EL6+.

 vdr-skins.spec |   40 +++++++++++++++++-----------------------
 1 files changed, 17 insertions(+), 23 deletions(-)
---
diff --git a/vdr-skins.spec b/vdr-skins.spec
index 46b096e..c24d3e8 100644
--- a/vdr-skins.spec
+++ b/vdr-skins.spec
@@ -5,10 +5,9 @@
 
 Name:           vdr-skins
 Version:        20111105
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Collection of OSD skins for VDR
 
-Group:          Applications/Multimedia
 License:        GPL+
 
 # Non-linked tarballs prepared with source99
@@ -51,7 +50,6 @@ Patch7:         enigma-0.3a-fonts.patch
 Patch8:         Aluminium-1.0-demo-fonts.patch
 # Sent upstream 2010-10-20
 Patch9:         %{name}-egalt2-finnish.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  vdr-devel >= 1.6.0-41
@@ -119,8 +117,6 @@ rm -r anthra_SD/{anthra_SD.skin,locale,themes}
 cd DeepBlue
 mv images images-normal
 ln -s images-normal images
-mv logos logos-normal
-ln -s logos-normal logos
 cd ..
 
 rm -r EgalSimple/{EgalSimple.skin.*,themes}
@@ -176,29 +172,24 @@ cat %{name}.lang %{name}.themes > %{name}.files
 %{_sbindir}/hardlink -cv $RPM_BUILD_ROOT%{_datadir}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+%pre
+# For overwriting a symlink with a dir in 20111105-3...
+dir=%{vdr_datadir}/text2skin/DeepBlue/logos
+[ $1 -gt 1 ] && [ -L $dir ] && rm -rf $(readlink -f $dir) $dir
 
 %triggerin -- vdr-dxr3
-for l in DeepBlue/{images,logos} Enigma/icons ; do
-    [ -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 || :
+for f in %{vdr_datadir}/text2skin/{DeepBlue/images,Enigma/icons} ; do
+    [ -L $f -o ! -e $f ] && rm -f $f && ln -s $(basename $f)-dxr3 $f || :
 done
 
 %triggerun -- vdr-dxr3
-if [ $2 -eq 0 ] ; then
-    for l in DeepBlue/{images,logos} Enigma/icons ; do
-        [ -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
+[ $2 -ne 0 ] || exit 0
+for f in %{vdr_datadir}/text2skin/{DeepBlue/images,Enigma/icons} ; do
+    [ -L $f -o ! -e $f ] && rm -f $f && ln -s $(basename $f)-normal $f || :
+done
 
 
 %files -f %{name}.files
-%defattr(-,root,root,-)
 %doc COPYING* HISTORY.* README.*
 
 %{vdr_datadir}/text2skin/Aluminium/
@@ -207,10 +198,9 @@ fi
 
 %dir %{vdr_datadir}/text2skin/DeepBlue/
 %{vdr_datadir}/text2skin/DeepBlue/DeepBlue.*
-%{vdr_datadir}/text2skin/DeepBlue/images-*
+%{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
+%{vdr_datadir}/text2skin/DeepBlue/logos/
 
 %{vdr_datadir}/text2skin/EgalSimple/
 
@@ -234,6 +224,10 @@ fi
 
 
 %changelog
+* Sun Jun 17 2012 Ville Skyttä <ville.skytta at iki.fi> - 20111105-3
+- Don't try to symlink to nonexistent DeepBlue/logos-dxr3.
+- Clean up specfile constructs no longer needed with Fedora or EL6+.
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20111105-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild