rpms/vdr-skins/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 vdr-skins-prepare-tarballs.sh, 1.1, 1.2 vdr-skins.spec, 1.7, 1.8

Mon Nov 24 19:12:22 UTC 2008

Author: scop

Update of /cvs/pkgs/rpms/vdr-skins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16438

Modified Files:
	.cvsignore sources vdr-skins-prepare-tarballs.sh 
	vdr-skins.spec 
Log Message:
* Mon Nov 24 2008 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 20081124-1
- Update enElchi to 0.7.2.
- Catch up again with latest dejavu-fonts changes.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-skins/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- .cvsignore	23 Apr 2007 19:59:47 -0000	1.2
+++ .cvsignore	24 Nov 2008 19:11:51 -0000	1.3
@@ -3,5 +3,5 @@
 EgalSimple-1.0-demo.tar.bz2
 SilverGreen-0.1.7.tar.bz2
 izegrey16-1.0-20050304-nologos.tar.bz2
-vdrskin-enElchi-0.7.1-nologos.tar.bz2
 vdrskin-enigma-0.3a-nologos.tar.bz2
+vdrskin-enElchi-0.7.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-skins/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Apr 2007 19:59:47 -0000	1.2
+++ sources	24 Nov 2008 19:11:51 -0000	1.3
@@ -3,5 +3,5 @@
 8676ae6f7596d7c09fbdec7468709bbc  EgalSimple-1.0-demo.tar.bz2
 89dd82fa698d139a15c4d24601188a0c  SilverGreen-0.1.7.tar.bz2
 8a238e3d1a3f2d62a37415e912e780e4  izegrey16-1.0-20050304-nologos.tar.bz2
-608e4f48ef1f7a6082ee50449b1b4dc1  vdrskin-enElchi-0.7.1-nologos.tar.bz2
 acdb6c15e86aee821401cc2697a4e225  vdrskin-enigma-0.3a-nologos.tar.bz2
+f1913e012a68f8ca7a1feb3da82b8709  vdrskin-enElchi-0.7.2.tgz


Index: vdr-skins-prepare-tarballs.sh
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-skins/devel/vdr-skins-prepare-tarballs.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr-skins-prepare-tarballs.sh	23 Apr 2007 19:59:47 -0000	1.1
+++ vdr-skins-prepare-tarballs.sh	24 Nov 2008 19:11:51 -0000	1.2
@@ -3,7 +3,7 @@
 set -e
 
 [ ! -e izegrey16-1.0-20050304.tar.gz ] && \
-wget -q http://skins.vdr-developer.org/text2skin/files/izegrey16-1.0-20050304.tar.gz
+curl -O http://skins.vdr-developer.org/text2skin/files/izegrey16-1.0-20050304.tar.gz
 rm -rf izegrey16
 tar zxf izegrey16-1.0-20050304.tar.gz
 rm -f izegrey16/{*.tar,*.ttf,logos/{*.mng,*.png,*.xpm}}
@@ -11,9 +11,9 @@
 rm -rf izegrey16
 
 [ ! -e vdrskin-enigma-0.3a.tar.bz2 ] && \
-wget -q http://home.pages.at/brougs78/files/vdrskin-enigma-0.3a.tar.bz2
+curl -O http://home.pages.at/brougs78/files/vdrskin-enigma-0.3a.tar.bz2
 [ ! -e icons-low-low-col.tar.gz ] && \
-wget -q http://ventoso.org/luca/vdr/Enigma/icons-low-low-col.tar.gz
+curl -O http://ventoso.org/luca/vdr/Enigma/icons-low-low-col.tar.gz
 rm -rf Enigma
 tar jxf vdrskin-enigma-0.3a.tar.bz2
 find Enigma -type d -exec chmod +x {} ';'
@@ -24,9 +24,9 @@
 rm -rf Enigma
 
 [ ! -e DeepBlue-0.1.4.tar.gz ] && \
-wget -q http://vdr.pfroen.de/download/DeepBlue-0.1.4.tar.gz
+curl -O http://vdr.pfroen.de/download/DeepBlue-0.1.4.tar.gz
 [ ! -e DeepBlueDXR3.tar.bz2 ] && \
-wget -q http://koti.mbnet.fi/cccatch/vdr/DeepBlueDXR3.tar.bz2
+curl -O http://koti.mbnet.fi/cccatch/vdr/DeepBlueDXR3.tar.bz2
 rm -rf DeepBlue DeepBlueDXR3
 tar zxf DeepBlue-0.1.4.tar.gz
 tar jxf DeepBlueDXR3.tar.bz2
@@ -37,16 +37,8 @@
 tar jcf DeepBlue-0.1.4-nologos.tar.bz2 DeepBlue
 rm -rf DeepBlue DeepBlueDXR3
 
-[ ! -e vdrskin-enElchi-0.7.1.tgz ] && \
-wget -q http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/vdrskin-enElchi-0.7.1.tgz
-rm -rf enElchi
-tar zxf vdrskin-enElchi-0.7.1.tgz
-rm -f enElchi/logos-*/*
-tar jcf vdrskin-enElchi-0.7.1-nologos.tar.bz2 enElchi
-rm -rf enElchi
-
 [ ! -e Aluminium-1.0-demo.tar.bz2 ] && \
-wget -q http://linux.kompiliert.net/contrib/Aluminium-1.0-demo.tar.bz2
+curl -O http://linux.kompiliert.net/contrib/Aluminium-1.0-demo.tar.bz2
 rm -rf Aluminium
 tar jxf Aluminium-1.0-demo.tar.bz2
 rm -f Aluminium/logos/*


Index: vdr-skins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-skins/devel/vdr-skins.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vdr-skins.spec	7 Apr 2008 21:01:28 -0000	1.7
+++ vdr-skins.spec	24 Nov 2008 19:11:51 -0000	1.8
@@ -8,9 +8,13 @@
 %define vdr_group %(vdr-config --group     2>/dev/null || echo ERROR)
 %define vdr_user  %(vdr-config --user      2>/dev/null || echo ERROR)
 
+%define sansfont  %{_datadir}/fonts/dejavu/DejaVuLGCSans.ttf
+%define boldfont  %{_datadir}/fonts/dejavu/DejaVuLGCSans-Bold.ttf
+%define monofont  %{_datadir}/fonts/dejavu/DejaVuLGCSansMono.ttf
+
 Name:           vdr-skins
-Version:        20061119
-Release:        6%{?dist}
+Version:        20081124
+Release:        1%{?dist}
 Summary:        Collection of OSD skins for VDR
 
 Group:          Applications/Multimedia
@@ -29,7 +33,7 @@
 # http://www.netholic.com/viewtopic.php?t=1464
 Source3:        DeepBlue-0.1.4-nologos.tar.bz2
 # http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/
-Source4:        vdrskin-enElchi-0.7.1-nologos.tar.bz2
+Source4:        http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/vdrskin-enElchi-0.7.2.tgz
 # http://www.fdm-ware.de/vdrskin/
 # http://linux.kompiliert.net/contrib/
 Source5:        Aluminium-1.0-demo-nologos.tar.bz2
@@ -46,9 +50,13 @@
 
 BuildArch:      noarch
 BuildRequires:  vdr-devel
+# Font build deps for checking filenames during build
+BuildRequires:  dejavu-fonts-lgc-sans
+BuildRequires:  dejavu-fonts-lgc-sans-mono
 Requires:       vdr-text2skin >= 1.1
 Requires:       vdr >= 1.4.6-2
-Requires:       dejavu-lgc-fonts >= 2.22
+Requires:       dejavu-fonts-lgc-sans
+Requires:       dejavu-fonts-lgc-sans-mono
 
 %description
 This package contains a collection of skins for VDR's on-screen display.
@@ -96,7 +104,7 @@
 
 cd Enigma
 rm -r themes
-ln -sf %{_datadir}/fonts/dejavu/DejaVuLGCSansMono.ttf FontMonoSpaced.ttf
+ln -sf %{monofont} FontMonoSpaced.ttf
 find . -type f -iname thumbs.db | xargs rm
 mv icons icons-dxr3
 ln -s icons-normal icons
@@ -104,9 +112,7 @@
 
 rm -rf enElchi/themes
 
-sed -i \
-    -e 's|Vera\.ttf|%{_datadir}/fonts/dejavu/DejaVuLGCSans.ttf|g' \
-    -e 's|VeraBd\.ttf|%{_datadir}/fonts/dejavu/DejaVuLGCSans-Bold.ttf|g' \
+sed -i -e 's|Vera\.ttf|%{sansfont}|g' -e 's|VeraBd\.ttf|%{boldfont}|g' \
     izegrey16/izegrey16.skin
 
 # Remove translations if built for VDR 1.6.x for now, text2skin crash issues.
@@ -134,12 +140,27 @@
 cp -pR $(find * -maxdepth 0 -type d) $RPM_BUILD_ROOT%{datadir}/text2skin/
 
 
+%check
+for font in %{sansfont} %{boldfont} %{monofont} ; do
+    if [ ! -r "$font" ] ; then
+        "Font file $font does not exist, specfile probably needs updating"
+        exit 1
+    fi
+done
+
+
 %clean
 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} enElchi/logos Enigma/icons ; do
+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 || :
@@ -147,7 +168,7 @@
 
 %triggerun -- vdr-dxr3
 if [ $2 -eq 0 ] ; then
-    for l in DeepBlue/{images,logos} enElchi/logos Enigma/icons ; do
+    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 || :
@@ -170,11 +191,7 @@
 
 %{datadir}/text2skin/EgalSimple/
 
-%dir %{datadir}/text2skin/enElchi/
-%{datadir}/text2skin/enElchi/enElchi*
-%verify(not link) %{datadir}/text2skin/enElchi/logos
-%{datadir}/text2skin/enElchi/logos-*/
-%{datadir}/text2skin/enElchi/symbols/
+%{datadir}/text2skin/enElchi/
 
 %dir %{datadir}/text2skin/Enigma/
 %{datadir}/text2skin/Enigma/Enigma*
@@ -192,6 +209,10 @@
 
 
 %changelog
+* Mon Nov 24 2008 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 20081124-1
+- Update enElchi to 0.7.2.
+- Catch up again with latest dejavu-fonts changes.
+
 * Mon Apr  7 2008 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 20061119-6
 - Don't install translations if built for VDR 1.6.0 due to text2skin issues.
 - Re-add disttag.


