[vdr-skins] - Add anthra_SD 0.2.3 and EgalT2 0.3.3+Finnish patch.

[Ville Skyttä]

commit 193d16bfe4a1e8ec34d04497d6c975721746cab5
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Thu Oct 21 00:23:46 2010 +0300

    - Add anthra_SD 0.2.3 and EgalT2 0.3.3+Finnish patch.

 .gitignore     |    2 ++
 sources        |    2 ++
 vdr-skins.spec |   33 ++++++++++++++++++++++++++-------
 3 files changed, 30 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f4af9fe..7fa84b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ SilverGreen-0.1.7.tar.bz2
 Skin-EgalsTry-1.1.0-nologos.tar.xz
 vdrskin-enElchi-0.7.2.tgz
 vdrskin-enigma-0.3a-nologos.tar.xz
+/anthra_SD-0.2.3.tgz
+/vdr-text2skin-EgalT2-0.3.3.tar.gz
diff --git a/sources b/sources
index d687e7a..1a68763 100644
--- a/sources
+++ b/sources
@@ -9,3 +9,5 @@ edd0fc660e55168a14223b3150e10f1f  izegrey16-1.0-20050304-nologos.tar.xz
 9ded71faf87400a031a18b8315909cb4  Skin-EgalsTry-1.1.0-nologos.tar.xz
 f1913e012a68f8ca7a1feb3da82b8709  vdrskin-enElchi-0.7.2.tgz
 c4a4a3078cffa557639130af829aeb55  vdrskin-enigma-0.3a-nologos.tar.xz
+a046648b6420a81e09982b3d13619468  anthra_SD-0.2.3.tgz
+fa173dacd3212fc6dbe0a9440d7a84e4  vdr-text2skin-EgalT2-0.3.3.tar.gz
diff --git a/vdr-skins.spec b/vdr-skins.spec
index b98f85b..47bec8f 100644
--- a/vdr-skins.spec
+++ b/vdr-skins.spec
@@ -9,7 +9,7 @@
 %global vdr_user  %(vdr-config --user      2>/dev/null || echo ERROR)
 
 Name:           vdr-skins
-Version:        20090901
+Version:        20101020
 Release:        1%{?dist}
 Summary:        Collection of OSD skins for VDR
 
@@ -39,6 +39,11 @@ Source6:        http://linux.kompiliert.net/contrib/EgalSimple-1.0-demo.tar.bz2
 Source7:        Skin-EgalsTry-1.1.0-nologos.tar.xz
 # http://www.vdrskins.org/vdrskins/thumbnails.php?album=58
 Source8:        http://web.archive.org/web/20060322201106/http://www.magoa.net/sttng-blue.theme
+# http://www.egal-vdr.de/skins/
+Source9:        http://www.egal-vdr.de/skins/vdr-text2skin-EgalT2-0.3.3.tar.gz
+# http://www.vdrportal.de/board/thread.php?threadid=94370
+# http://www.vdrportal.de/board/thread.php?postid=947786#post947786
+Source10:       http://www.justlinux.de/vdr/anthra_SD-0.2.3.tgz
 Source99:       %{name}-prepare-tarballs.sh
 
 Patch0:         %{name}-aluminium-i18n.patch
@@ -50,13 +55,15 @@ Patch5:         http://toms-cafe.de/vdr/download/enelchi-0.7.2-locale.diff
 Patch6:         izegrey16-1.0-20050304-fonts.patch
 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
 BuildRequires:  gettext
 BuildRequires:  hardlink
-Requires:       vdr-text2skin >= 1.2-3
+Requires:       vdr-text2skin >= 1.3
 Requires:       vdr >= 1.6.0
 # Actually any sans+monospace set would do
 Requires:       dejavu-sans-fonts
@@ -67,7 +74,7 @@ This package contains a collection of skins for VDR's on-screen display.
 
 
 %prep
-%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7
+%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a9 -a10
 find . -type d -exec chmod 755 {} ';'
 find . -type f -exec chmod 644 {} ';'
 find . -type d -name CVS* | xargs rm -r
@@ -93,6 +100,7 @@ cd izegrey16
 %patch6 -p0
 cd ..
 %patch8 -p0
+%patch9 -p0
 
 SKINS=$(find * -maxdepth 0 -type d)
 
@@ -113,6 +121,8 @@ done
 ln -sf mp3.png Aluminium/replay/mp3oss.png
 rm -r Aluminium/{Aluminium.skin.*,MERKEN,fonts}
 
+rm -r anthra_SD/{anthra_SD.skin,locale,themes}
+
 cd DeepBlue
 mv images images-normal
 ln -s images-normal images
@@ -124,6 +134,8 @@ rm -r EgalSimple/{EgalSimple.skin.*,themes}
 
 rm -r EgalsTry/{theme,tools}
 
+rm -r EgalT2/{EgalT2.skin,locale,skin.bup,themes}
+
 cd Enigma
 rm -r fonts themes *.ttf
 find . -type f -iname thumbs.db | xargs rm
@@ -138,8 +150,8 @@ find . -name "*.trans" -delete
 
 
 %build
-for skin in DeepBlue enElchi Enigma ; do
-    make -C $skin %{?_smp_mflags}
+for skin in anthra_SD DeepBlue EgalT2 enElchi Enigma ; do
+    make -C $skin %{?_smp_mflags} HDSKIN=0 LOGOSLEFT=0 NOLOGOS=1
 done
 
 
@@ -157,9 +169,9 @@ find $RPM_BUILD_ROOT%{vardir}/themes -name "*.theme" ! -size 0 \
 
 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}
+rm -r $RPM_BUILD_ROOT%{datadir}/text2skin/*/{Makefile,locale,po,*.template}
 
-for skin in DeepBlue enElchi Enigma ; do
+for skin in anthra_SD DeepBlue EgalT2 enElchi Enigma ; do
     make -C $skin install-i18n DESTDIR=$RPM_BUILD_ROOT LOCDIR=%{_datadir}/locale
 done
 %find_lang %{name} --all-name
@@ -203,6 +215,8 @@ fi
 
 %{datadir}/text2skin/Aluminium/
 
+%{datadir}/text2skin/anthra_SD/
+
 %dir %{datadir}/text2skin/DeepBlue/
 %{datadir}/text2skin/DeepBlue/DeepBlue.*
 %{datadir}/text2skin/DeepBlue/images-*
@@ -214,6 +228,8 @@ fi
 
 %{datadir}/text2skin/EgalsTry/
 
+%{datadir}/text2skin/EgalT2/
+
 %{datadir}/text2skin/enElchi/
 
 %dir %{datadir}/text2skin/Enigma/
@@ -230,6 +246,9 @@ fi
 
 
 %changelog
+* Wed Oct 20 2010 Ville Skyttä <ville.skytta at iki.fi> - 20101020-1
+- Add anthra_SD 0.2.3 and EgalT2 0.3.3+Finnish patch.
+
 * Tue Sep  1 2009 Ville Skyttä <ville.skytta at iki.fi> - 20090901-1
 - Adapt to recent 1.2+ text2skin versions; patch Aluminium, enigma and izegrey
   font handling (no longer filename based font paths, phew).