From 36f16e5fc08a7d0965c3cd9f024c69cb47591dae Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 22 Apr 2008 00:31:55 +0000 Subject: [PATCH 01/27] Initialize branch F-9 for vdr-skins --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 6c76f97f0a594294030e3b795c8cbbbbdc77ce4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 24 Nov 2008 19:11:51 +0000 Subject: [PATCH 02/27] - Update enElchi to 0.7.2. - Catch up again with latest dejavu-fonts changes. --- .cvsignore | 2 +- sources | 2 +- vdr-skins-prepare-tarballs.sh | 20 +++++--------- vdr-skins.spec | 51 ++++++++++++++++++++++++----------- 4 files changed, 44 insertions(+), 31 deletions(-) diff --git a/.cvsignore b/.cvsignore index 40ebaa1..c045d2f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -3,5 +3,5 @@ DeepBlue-0.1.4-nologos.tar.bz2 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 diff --git a/sources b/sources index d111704..9a9240c 100644 --- a/sources +++ b/sources @@ -3,5 +3,5 @@ f7aca33ccc3f17f257a6919d1f2d5bc0 Aluminium-1.0-demo-nologos.tar.bz2 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 diff --git a/vdr-skins-prepare-tarballs.sh b/vdr-skins-prepare-tarballs.sh index e9c933b..d4399a7 100644 --- a/vdr-skins-prepare-tarballs.sh +++ b/vdr-skins-prepare-tarballs.sh @@ -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 @@ tar jcf izegrey16-1.0-20050304-nologos.tar.bz2 izegrey16 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 @@ tar jcf vdrskin-enigma-0.3a-nologos.tar.bz2 Enigma 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 @@ mv DeepBlueDXR3/images DeepBlue/images-dxr3 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/* diff --git a/vdr-skins.spec b/vdr-skins.spec index fca095d..a6f4c9d 100644 --- a/vdr-skins.spec +++ b/vdr-skins.spec @@ -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 @@ Source2: vdrskin-enigma-0.3a-nologos.tar.bz2 # 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 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 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 @@ rm -r EgalSimple/{EgalSimple.skin.*,themes} 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 @@ cd .. 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 @@ install -dm 755 $RPM_BUILD_ROOT%{datadir}/text2skin 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 @@ done %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 @@ fi %{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 @@ fi %changelog +* Mon Nov 24 2008 Ville Skyttä - 20081124-1 +- Update enElchi to 0.7.2. +- Catch up again with latest dejavu-fonts changes. + * Mon Apr 7 2008 Ville Skyttä - 20061119-6 - Don't install translations if built for VDR 1.6.0 due to text2skin issues. - Re-add disttag. From 3786938e792d121ae232505758b51b6f12b5b015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 25 Dec 2008 06:35:15 +0000 Subject: [PATCH 03/27] - Use DejaVu fonts for Aluminium and Enigma (#477478). --- vdr-skins.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/vdr-skins.spec b/vdr-skins.spec index a6f4c9d..7fb6328 100644 --- a/vdr-skins.spec +++ b/vdr-skins.spec @@ -14,7 +14,7 @@ Name: vdr-skins Version: 20081124 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Collection of OSD skins for VDR Group: Applications/Multimedia @@ -91,7 +91,8 @@ for s in $SKINS ; do done ln -sf mp3.png Aluminium/replay/mp3oss.png -rm Aluminium/{Aluminium.skin.*,MERKEN} +sed -i -e 's|\bhelmetr\.ttf\b|%{sansfont}|g' Aluminium/Aluminium.skin +rm -r Aluminium/{Aluminium.skin.*,MERKEN,fonts} cd DeepBlue mv images images-normal @@ -103,8 +104,11 @@ cd .. rm -r EgalSimple/{EgalSimple.skin.*,themes} cd Enigma -rm -r themes -ln -sf %{monofont} FontMonoSpaced.ttf +sed -i -e 's|\bFont\.ttf\b|%{sansfont}|g' \ + -e 's|\bFontBold\.ttf\b|%{boldfont}|g' \ + -e 's|\bFontMonoSpaced\.ttf\b|%{monofont}|g' \ + Enigma.skin +rm -r fonts themes *.ttf find . -type f -iname thumbs.db | xargs rm mv icons icons-dxr3 ln -s icons-normal icons @@ -195,8 +199,6 @@ fi %dir %{datadir}/text2skin/Enigma/ %{datadir}/text2skin/Enigma/Enigma* -%{datadir}/text2skin/Enigma/Font* -%{datadir}/text2skin/Enigma/fonts/ %{datadir}/text2skin/Enigma/hqlogos/ %{datadir}/text2skin/Enigma/icons-*/ %verify(not link) %{datadir}/text2skin/Enigma/icons @@ -209,6 +211,9 @@ fi %changelog +* Thu Dec 25 2008 Ville Skyttä - 20081124-2 +- Use DejaVu fonts for Aluminium and Enigma (#477478). + * Mon Nov 24 2008 Ville Skyttä - 20081124-1 - Update enElchi to 0.7.2. - Catch up again with latest dejavu-fonts changes. From a733e9b8e55b774e131e52710f7eafc151a7fd14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 10 Jan 2009 20:52:50 +0000 Subject: [PATCH 04/27] - Use full DejaVu fonts instead of LGC (#477478). --- vdr-skins.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/vdr-skins.spec b/vdr-skins.spec index 7fb6328..7083fdc 100644 --- a/vdr-skins.spec +++ b/vdr-skins.spec @@ -8,13 +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 +%define sansfont %{_datadir}/fonts/dejavu/DejaVuSans.ttf +%define boldfont %{_datadir}/fonts/dejavu/DejaVuSans-Bold.ttf +%define monofont %{_datadir}/fonts/dejavu/DejaVuSansMono.ttf Name: vdr-skins Version: 20081124 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Collection of OSD skins for VDR Group: Applications/Multimedia @@ -51,12 +51,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: vdr-devel # Font build deps for checking filenames during build -BuildRequires: dejavu-fonts-lgc-sans -BuildRequires: dejavu-fonts-lgc-sans-mono +BuildRequires: dejavu-fonts-sans +BuildRequires: dejavu-fonts-sans-mono Requires: vdr-text2skin >= 1.1 Requires: vdr >= 1.4.6-2 -Requires: dejavu-fonts-lgc-sans -Requires: dejavu-fonts-lgc-sans-mono +Requires: dejavu-fonts-sans +Requires: dejavu-fonts-sans-mono %description This package contains a collection of skins for VDR's on-screen display. @@ -211,6 +211,9 @@ fi %changelog +* Sat Jan 10 2009 Ville Skyttä - 20081124-3 +- Use full DejaVu fonts instead of LGC (#477478). + * Thu Dec 25 2008 Ville Skyttä - 20081124-2 - Use DejaVu fonts for Aluminium and Enigma (#477478). From 4ec9be445454e6da7736931963bcfa055ef0369d Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 23:58:06 +0000 Subject: [PATCH 05/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- vdr-skins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-skins.spec b/vdr-skins.spec index 7083fdc..398d27e 100644 --- a/vdr-skins.spec +++ b/vdr-skins.spec @@ -14,7 +14,7 @@ Name: vdr-skins Version: 20081124 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Collection of OSD skins for VDR Group: Applications/Multimedia @@ -211,6 +211,9 @@ fi %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 20081124-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sat Jan 10 2009 Ville Skyttä - 20081124-3 - Use full DejaVu fonts instead of LGC (#477478). From fa6b31bf8ddf564a21a1d265732740bbfbb04737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 26 Feb 2009 22:41:12 +0000 Subject: [PATCH 06/27] - More deja vu with dejavu-fonts changes (#480477). - Use %global instead of %define. --- vdr-skins.spec | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/vdr-skins.spec b/vdr-skins.spec index 398d27e..4a75ce0 100644 --- a/vdr-skins.spec +++ b/vdr-skins.spec @@ -3,18 +3,18 @@ # - where has DeepBlue gone? # - manage symlinks with alternatives? -%define vardir %(vdr-config --vardir 2>/dev/null || echo ERROR) -%define datadir %(vdr-config --datadir 2>/dev/null || echo ERROR) -%define vdr_group %(vdr-config --group 2>/dev/null || echo ERROR) -%define vdr_user %(vdr-config --user 2>/dev/null || echo ERROR) +%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) -%define sansfont %{_datadir}/fonts/dejavu/DejaVuSans.ttf -%define boldfont %{_datadir}/fonts/dejavu/DejaVuSans-Bold.ttf -%define monofont %{_datadir}/fonts/dejavu/DejaVuSansMono.ttf +%global sansfont %{_datadir}/fonts/dejavu/DejaVuSans.ttf +%global boldfont %{_datadir}/fonts/dejavu/DejaVuSans-Bold.ttf +%global monofont %{_datadir}/fonts/dejavu/DejaVuSansMono.ttf Name: vdr-skins Version: 20081124 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Collection of OSD skins for VDR Group: Applications/Multimedia @@ -51,12 +51,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: vdr-devel # Font build deps for checking filenames during build -BuildRequires: dejavu-fonts-sans -BuildRequires: dejavu-fonts-sans-mono +BuildRequires: dejavu-sans-fonts +BuildRequires: dejavu-sans-mono-fonts Requires: vdr-text2skin >= 1.1 Requires: vdr >= 1.4.6-2 -Requires: dejavu-fonts-sans -Requires: dejavu-fonts-sans-mono +Requires: dejavu-sans-fonts +Requires: dejavu-sans-mono-fonts %description This package contains a collection of skins for VDR's on-screen display. @@ -211,6 +211,10 @@ fi %changelog +* Fri Feb 27 2009 Ville Skyttä - 20081124-5 +- More deja vu with dejavu-fonts changes (#480477). +- Use %%global instead of %%define. + * Wed Feb 25 2009 Fedora Release Engineering - 20081124-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ec0327718a387585edc6dce4aac90db682c95450 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 06:46:41 +0000 Subject: [PATCH 07/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- vdr-skins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-skins.spec b/vdr-skins.spec index 4a75ce0..28a7fc8 100644 --- a/vdr-skins.spec +++ b/vdr-skins.spec @@ -14,7 +14,7 @@ Name: vdr-skins Version: 20081124 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Collection of OSD skins for VDR Group: Applications/Multimedia @@ -211,6 +211,9 @@ fi %changelog +* Sun Jul 26 2009 Fedora Release Engineering - 20081124-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Fri Feb 27 2009 Ville Skyttä - 20081124-5 - More deja vu with dejavu-fonts changes (#480477). - Use %%global instead of %%define. From a050e50cd5ea1a7b123cc6e6c23e3c30918a24d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 1 Sep 2009 21:14:25 +0000 Subject: [PATCH 08/27] =?UTF-8?q?-=20Adapt=20to=20recent=201.2+=20text2ski?= =?UTF-8?q?n=20versions;=20patch=20Aluminium,=20enigma=20and=20=20=20=20?= =?UTF-8?q?=20izegrey=20font=20handling=20(no=20longer=20filename=20based?= =?UTF-8?q?=20font=20paths,=20phew).=20-=20Add=20EgalsTry=201.1.0.=20-=20A?= =?UTF-8?q?pply=20Thomas=20G=C3=BCnther's=20locale=20patches=20for=20DeepB?= =?UTF-8?q?lue,=20enElchi,=20and=20Enigma.=20-=20Drop=20unused=20SilverGre?= =?UTF-8?q?en=20themes,=20install=20default=20properly.=20-=20Recompress?= =?UTF-8?q?=20cleaned=20up=20tarballs=20with=20xz.=20-=20Hardlink=20identi?= =?UTF-8?q?cal=20files.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 12 +- Aluminium-1.0-demo-fonts.patch | 21 + enigma-0.3a-fonts.patch | 621 +++++++++++++++++++++++++++++ izegrey16-1.0-20050304-fonts.patch | 214 ++++++++++ sources | 12 +- vdr-skins-prepare-tarballs.sh | 16 +- vdr-skins.spec | 124 +++--- 7 files changed, 960 insertions(+), 60 deletions(-) create mode 100644 Aluminium-1.0-demo-fonts.patch create mode 100644 enigma-0.3a-fonts.patch create mode 100644 izegrey16-1.0-20050304-fonts.patch diff --git a/.cvsignore b/.cvsignore index c045d2f..f4af9fe 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,7 +1,11 @@ -Aluminium-1.0-demo-nologos.tar.bz2 -DeepBlue-0.1.4-nologos.tar.bz2 +Aluminium-1.0-demo-nologos.tar.xz +deepblue-0.1.4-locale.diff +DeepBlue-0.1.4-nologos.tar.xz EgalSimple-1.0-demo.tar.bz2 +enelchi-0.7.2-locale.diff +enigma-0.3a-locale.diff +izegrey16-1.0-20050304-nologos.tar.xz SilverGreen-0.1.7.tar.bz2 -izegrey16-1.0-20050304-nologos.tar.bz2 -vdrskin-enigma-0.3a-nologos.tar.bz2 +Skin-EgalsTry-1.1.0-nologos.tar.xz vdrskin-enElchi-0.7.2.tgz +vdrskin-enigma-0.3a-nologos.tar.xz diff --git a/Aluminium-1.0-demo-fonts.patch b/Aluminium-1.0-demo-fonts.patch new file mode 100644 index 0000000..8bb2976 --- /dev/null +++ b/Aluminium-1.0-demo-fonts.patch @@ -0,0 +1,21 @@ +diff -up Aluminium/Aluminium.skin~ Aluminium/Aluminium.skin +--- Aluminium/Aluminium.skin~ 2004-12-08 20:45:13.000000000 +0200 ++++ Aluminium/Aluminium.skin 2009-07-13 00:04:06.000000000 +0300 +@@ -155,7 +155,7 @@ + {PresentTitle} + {PresentStartDateTime:%d.%m. %H\:%M} - {PresentEndDateTime:%H\:%M} + VPS: {PresentVPSDateTime:%H\:%M} +- ++ + {PresentShortText} + {PresentDescription} + +- {ChannelNumber} +- {ChannelNumber} +- {ChannelName} +- {ChannelName} ++ {ChannelNumber} ++ {ChannelNumber} ++ {ChannelName} ++ {ChannelName} + + + + + +- {PresentStartDateTime:%H\:%M} ++ {PresentStartDateTime:%H\:%M} + + + +@@ -72,25 +72,25 @@ + + + +- {PresentStartDateTime:%H\:%M} ++ {PresentStartDateTime:%H\:%M} + + + +- {PresentTitle} ++ {PresentTitle} + + +- {PresentTitle} +- {PresentShortText} ++ {PresentTitle} ++ {PresentShortText} + + +- {PresentDuration:%m}' +- +{PresentRemaining:%m}' ++ {PresentDuration:%m}' ++ +{PresentRemaining:%m}' + + + + + +- {FollowingStartDateTime:%H\:%M} ++ {FollowingStartDateTime:%H\:%M} + + + +@@ -98,18 +98,18 @@ + + + +- {FollowingStartDateTime:%H\:%M} ++ {FollowingStartDateTime:%H\:%M} + + + +- {FollowingTitle} ++ {FollowingTitle} + + +- {FollowingTitle} +- {FollowingShortText} ++ {FollowingTitle} ++ {FollowingShortText} + + +- {FollowingDuration:%m}' ++ {FollowingDuration:%m}' + + + +@@ -117,8 +117,8 @@ + + + +- {DateTime:%d.%m.} +- {DateTime:%H\:%M} ++ {DateTime:%d.%m.} ++ {DateTime:%H\:%M} + + + +@@ -156,9 +156,9 @@ + + + +- {AudioTrack} ({AudioChannel} channel) +- {AudioTrack} +- {AudioChannel} channel ++ {AudioTrack} ({AudioChannel} channel) ++ {AudioTrack} ++ {AudioChannel} channel + + + +@@ -179,16 +179,16 @@ + + + +- {DateTime:%d.%m.} +- {DateTime:%H\:%M} ++ {DateTime:%d.%m.} ++ {DateTime:%H\:%M} + + + + +- {ChannelNumber} +- {ChannelNumber} +- {ChannelName} +- {ChannelName} ++ {ChannelNumber} ++ {ChannelNumber} ++ {ChannelName} ++ {ChannelName} + + + +@@ -210,15 +210,15 @@ + + + +- {AudioTrack} ({AudioChannel} channel) +- {AudioTrack} +- {AudioChannel} channel ++ {AudioTrack} ({AudioChannel} channel) ++ {AudioTrack} ++ {AudioChannel} channel + + + + +- {ChannelName} +- {ChannelName} ++ {ChannelName} ++ {ChannelName} + + + +@@ -232,8 +232,8 @@ + + + +- {Message} +- {Message} ++ {Message} ++ {Message} + + + +@@ -269,10 +269,10 @@ + + + +- {ChannelNumber} +- {ChannelNumber} +- {ChannelName} +- {ChannelName} ++ {ChannelNumber} ++ {ChannelNumber} ++ {ChannelName} ++ {ChannelName} + + + +@@ -294,15 +294,15 @@ + + + +- {AudioTrack} ({AudioChannel} channel) +- {AudioTrack} +- {AudioChannel} channel ++ {AudioTrack} ({AudioChannel} channel) ++ {AudioTrack} ++ {AudioChannel} channel + + + + +- {ChannelName} +- {ChannelName} ++ {ChannelName} ++ {ChannelName} + + + +@@ -313,8 +313,8 @@ + + + +- {DateTime:%d.%m.} +- {DateTime:%H\:%M} ++ {DateTime:%d.%m.} ++ {DateTime:%H\:%M} + + + +@@ -326,8 +326,8 @@ + + + +- {Message} +- {Message} ++ {Message} ++ {Message} + + + +@@ -385,8 +385,8 @@ + + + +- {ReplayTitle} +- {ReplayTitle} ++ {ReplayTitle} ++ {ReplayTitle} + + + +@@ -409,9 +409,9 @@ + + + +- {ReplayPosition} +- {ReplayDuration} +- {ReplayPrompt} ++ {ReplayPosition} ++ {ReplayDuration} ++ {ReplayPrompt} + + + +@@ -419,8 +419,8 @@ + + + +- {DateTime:%d.%m.} +- {DateTime:%H\:%M} ++ {DateTime:%d.%m.} ++ {DateTime:%H\:%M} + + + +@@ -432,8 +432,8 @@ + + + +- {Message} +- {Message} ++ {Message} ++ {Message} + + + +@@ -490,8 +490,8 @@ + + + +- {Message} +- {Message} ++ {Message} ++ {Message} + + + +@@ -518,12 +518,12 @@ + + + +- {MenuTitle:rest} +- {MenuTitle:rest} ++ {MenuTitle:rest} ++ {MenuTitle:rest} + + +- {MenuTitle:rest} +- {MenuTitle:rest} ++ {MenuTitle:rest} ++ {MenuTitle:rest} + + + +@@ -620,11 +620,11 @@ + + + +- VDR +- VDR ++ VDR ++ VDR + +- {MenuTitle} +- {MenuTitle} ++ {MenuTitle} ++ {MenuTitle} + + + +@@ -640,10 +640,10 @@ + + + +- {MenuGroup} +- {MenuItem} +- {MenuCurrent} +- {MenuCurrent} ++ {MenuGroup} ++ {MenuItem} ++ {MenuCurrent} ++ {MenuCurrent} + + + +@@ -655,10 +655,10 @@ + + + +- {MenuGroup} +- {MenuItem} +- {MenuCurrent} +- {MenuCurrent} ++ {MenuGroup} ++ {MenuItem} ++ {MenuCurrent} ++ {MenuCurrent} + + + +@@ -673,10 +673,10 @@ + + + +- {MenuGroup} +- {MenuItem} +- {MenuCurrent} +- {MenuCurrent} ++ {MenuGroup} ++ {MenuItem} ++ {MenuCurrent} ++ {MenuCurrent} + + + +@@ -690,10 +690,10 @@ + + + +- {MenuGroup} +- {MenuItem} +- {MenuCurrent} +- {MenuCurrent} ++ {MenuGroup} ++ {MenuItem} ++ {MenuCurrent} ++ {MenuCurrent} + + + +@@ -703,11 +703,11 @@ + + + +- {PresentTitle} +- {PresentShortText} ++ {PresentTitle} ++ {PresentShortText} + + +- {PresentTitle} ++ {PresentTitle} + + + +@@ -718,13 +718,13 @@ + + + +- {PresentStartDateTime:%d.%m.} {PresentStartDateTime:%H\:%M}-{PresentEndDateTime:%H\:%M} ({PresentRemaining:%m}/{PresentDuration:%m}') ++ {PresentStartDateTime:%d.%m.} {PresentStartDateTime:%H\:%M}-{PresentEndDateTime:%H\:%M} ({PresentRemaining:%m}/{PresentDuration:%m}') + + + + + +- {PresentStartDateTime:%d.%m.} {PresentStartDateTime:%H\:%M}-{PresentEndDateTime:%H\:%M} ({PresentDuration:%m}') ++ {PresentStartDateTime:%d.%m.} {PresentStartDateTime:%H\:%M}-{PresentEndDateTime:%H\:%M} ({PresentDuration:%m}') + + + +@@ -734,10 +734,10 @@ + + +- {PresentVPSDateTime:%H\:%M} ++ {PresentVPSDateTime:%H\:%M} + + +- {PresentDescription} ++ {PresentDescription} + + + +@@ -747,25 +747,25 @@ + + + +- {RecordingTitle} +- {RecordingShortText} ++ {RecordingTitle} ++ {RecordingShortText} + + +- {RecordingTitle} ++ {RecordingTitle} + + + + + + +- {RecordingDateTime:%d.%m. %H\:%M} ++ {RecordingDateTime:%d.%m. %H\:%M} + + + + +- {RecordingDescription} ++ {RecordingDescription} + + + +@@ -774,17 +774,17 @@ + + + +- {MenuText} +- {MenuText} ++ {MenuText} ++ {MenuText} + + + + + + +- RECORDING: {CurrentRecording} ++ RECORDING: {CurrentRecording} + +- RECORDINGS: {CurrentRecording} ++ RECORDINGS: {CurrentRecording} + + + +@@ -798,8 +798,8 @@ + + + +- {Message} +- {Message} ++ {Message} ++ {Message} + + + +@@ -809,33 +809,33 @@ + + + +- {DateTime:%d.%m.} +- {DateTime:%H\:%M} ++ {DateTime:%d.%m.} ++ {DateTime:%H\:%M} + + + + + +- {ButtonRed} +- {ButtonRed} ++ {ButtonRed} ++ {ButtonRed} + + + + +- {ButtonGreen} +- {ButtonGreen} ++ {ButtonGreen} ++ {ButtonGreen} + + + + +- {ButtonYellow} +- {ButtonYellow} ++ {ButtonYellow} ++ {ButtonYellow} + + + + +- {ButtonBlue} +- {ButtonBlue} ++ {ButtonBlue} ++ {ButtonBlue} + + + +@@ -868,8 +868,8 @@ + + + +- Volume +- Volume ++ Volume ++ Volume + + + +@@ -882,8 +882,8 @@ + + + +- {DateTime:%d.%m.} +- {DateTime:%H\:%M} ++ {DateTime:%d.%m.} ++ {DateTime:%H\:%M} + + + +@@ -895,8 +895,8 @@ + + + +- {Message} +- {Message} ++ {Message} ++ {Message} + + + +@@ -918,8 +918,8 @@ + + + +- Message +- Message ++ Message ++ Message + + + +@@ -932,16 +932,16 @@ + + + +- {Message} +- {Message} ++ {Message} ++ {Message} + + + + + + +- {DateTime:%d.%m.} +- {DateTime:%H\:%M} ++ {DateTime:%d.%m.} ++ {DateTime:%H\:%M} + + + +@@ -969,18 +969,18 @@ + + + +- Audio +- Audio ++ Audio ++ Audio + + + + + + +- {MenuItem} ++ {MenuItem} + +- {MenuCurrent} +- {MenuCurrent} ++ {MenuCurrent} ++ {MenuCurrent} + + + +@@ -990,7 +990,7 @@ + + + +- {DateTime:%d.%m.} +- {DateTime:%H\:%M} ++ {DateTime:%d.%m.} ++ {DateTime:%H\:%M} + + diff --git a/izegrey16-1.0-20050304-fonts.patch b/izegrey16-1.0-20050304-fonts.patch new file mode 100644 index 0000000..604d4b7 --- /dev/null +++ b/izegrey16-1.0-20050304-fonts.patch @@ -0,0 +1,214 @@ +Index: izegrey16.skin +=================================================================== +RCS file: /var/cvsroot/skins/izegrey16/izegrey16.skin,v +retrieving revision 1.1 +diff -u -r1.1 izegrey16.skin +--- izegrey16.skin 4 Mar 2005 18:41:46 -0000 1.1 ++++ izegrey16.skin 12 Jul 2009 20:11:18 -0000 +@@ -7,7 +7,7 @@ + + + +- Volume ++ Volume + + + +@@ -16,10 +16,10 @@ + + + +- {MessageInfo} +- {MessageStatus} +- {MessageWarning} +- {MessageError} ++ {MessageInfo} ++ {MessageStatus} ++ {MessageWarning} ++ {MessageError} + + + +@@ -30,8 +30,8 @@ + + + +- {ReplayTitle} +- {ReplayPosition} / {ReplayDuration} ++ {ReplayTitle} ++ {ReplayPosition} / {ReplayDuration} + + + +@@ -85,21 +85,21 @@ + + + +- {ChannelNumber} ++ {ChannelNumber} + + +- {DateTime:%a %d.%m.} +- {DateTime:%H\:%M} ++ {DateTime:%a %d.%m.} ++ {DateTime:%H\:%M} + + + +- {ChannelName} ++ {ChannelName} + + + + +- {PresentStartDateTime:%H\:%M} +- {FollowingStartDateTime:%H\:%M} ++ {PresentStartDateTime:%H\:%M} ++ {FollowingStartDateTime:%H\:%M} + + + +@@ -107,10 +107,10 @@ + + + +- {PresentTitle} +- {PresentShortText} +- {FollowingTitle} +- {FollowingShortText} ++ {PresentTitle} ++ {PresentShortText} ++ {FollowingTitle} ++ {FollowingShortText} + + + +@@ -132,8 +132,8 @@ + + + +- {DateTime:%a %d.%m. %H\:%M} +- {MenuTitle} ++ {DateTime:%a %d.%m. %H\:%M} ++ {MenuTitle} + + + +@@ -141,41 +141,41 @@ + + + +- {MenuGroup} +- {MenuCurrent} +- {MenuItem} ++ {MenuGroup} ++ {MenuCurrent} ++ {MenuItem} + + + + + + +- {ButtonRed} ++ {ButtonRed} + + + + +- {ButtonGreen} ++ {ButtonGreen} + + + + + +- {ButtonYellow} ++ {ButtonYellow} + + + + + + +- {ButtonBlue} ++ {ButtonBlue} + + + +- {PresentStartDateTime:%d.%m. %H\:%M} - {PresentEndDateTime:%H\:%M} +- VPS: {PresentVPSDateTime:%H\:%M} +- {PresentTitle} +- {PresentShortText}{PresentDescription} ++ {PresentStartDateTime:%d.%m. %H\:%M} - {PresentEndDateTime:%H\:%M} ++ VPS: {PresentVPSDateTime:%H\:%M} ++ {PresentTitle} ++ {PresentShortText}{PresentDescription} + + + +@@ -183,7 +183,7 @@ + + + +- {MenuText} ++ {MenuText} + + + +@@ -192,28 +192,28 @@ + + + +- {MessageInfo} ++ {MessageInfo} + + + + + + +- {MessageStatus} ++ {MessageStatus} + + + + + + +- {MessageWarning} ++ {MessageWarning} + + + + + + +- {MessageError} ++ {MessageError} + + + +@@ -225,7 +225,7 @@ + + + +- {MenuTitle} ++ {MenuTitle} + + + +@@ -234,11 +234,11 @@ + + + +- {MenuItem} ++ {MenuItem} + + + +- {MenuCurrent} ++ {MenuCurrent} + + + diff --git a/sources b/sources index 9a9240c..d687e7a 100644 --- a/sources +++ b/sources @@ -1,7 +1,11 @@ -f7aca33ccc3f17f257a6919d1f2d5bc0 Aluminium-1.0-demo-nologos.tar.bz2 -8527b1fc6f7a5bacd622ee828de3f203 DeepBlue-0.1.4-nologos.tar.bz2 +00a37ab75fcadeb46385d585938bfe56 Aluminium-1.0-demo-nologos.tar.xz +b4982b8a9900897f215eadab0acef6db deepblue-0.1.4-locale.diff +46bf3259b319df37a0d532020a9d9f74 DeepBlue-0.1.4-nologos.tar.xz 8676ae6f7596d7c09fbdec7468709bbc EgalSimple-1.0-demo.tar.bz2 +6d25e2376a348596ffc4c35ad4480606 enelchi-0.7.2-locale.diff +9a305465f90e9ce1e52b4238df8489b0 enigma-0.3a-locale.diff +edd0fc660e55168a14223b3150e10f1f izegrey16-1.0-20050304-nologos.tar.xz 89dd82fa698d139a15c4d24601188a0c SilverGreen-0.1.7.tar.bz2 -8a238e3d1a3f2d62a37415e912e780e4 izegrey16-1.0-20050304-nologos.tar.bz2 -acdb6c15e86aee821401cc2697a4e225 vdrskin-enigma-0.3a-nologos.tar.bz2 +9ded71faf87400a031a18b8315909cb4 Skin-EgalsTry-1.1.0-nologos.tar.xz f1913e012a68f8ca7a1feb3da82b8709 vdrskin-enElchi-0.7.2.tgz +c4a4a3078cffa557639130af829aeb55 vdrskin-enigma-0.3a-nologos.tar.xz diff --git a/vdr-skins-prepare-tarballs.sh b/vdr-skins-prepare-tarballs.sh index d4399a7..d519376 100644 --- a/vdr-skins-prepare-tarballs.sh +++ b/vdr-skins-prepare-tarballs.sh @@ -7,7 +7,7 @@ curl -O http://skins.vdr-developer.org/text2skin/files/izegrey16-1.0-20050304.ta rm -rf izegrey16 tar zxf izegrey16-1.0-20050304.tar.gz rm -f izegrey16/{*.tar,*.ttf,logos/{*.mng,*.png,*.xpm}} -tar jcf izegrey16-1.0-20050304-nologos.tar.bz2 izegrey16 +tar c izegrey16 | xz --best > izegrey16-1.0-20050304-nologos.tar.xz rm -rf izegrey16 [ ! -e vdrskin-enigma-0.3a.tar.bz2 ] && \ @@ -20,7 +20,7 @@ find Enigma -type d -exec chmod +x {} ';' mv Enigma/icons Enigma/icons-normal tar zx -C Enigma -f $PWD/icons-low-low-col.tar.gz rm -rf Enigma/{hqlogos/*,fonts/ttf-bitstream-vera*,patches} -tar jcf vdrskin-enigma-0.3a-nologos.tar.bz2 Enigma +tar c Enigma | xz --best > vdrskin-enigma-0.3a-nologos.tar.xz rm -rf Enigma [ ! -e DeepBlue-0.1.4.tar.gz ] && \ @@ -34,7 +34,7 @@ find DeepBlueDXR3 -type d -exec chmod +x {} ';' rm -rf DeepBlue/logos/* mv DeepBlueDXR3/HISTORY DeepBlue mv DeepBlueDXR3/images DeepBlue/images-dxr3 -tar jcf DeepBlue-0.1.4-nologos.tar.bz2 DeepBlue +tar c DeepBlue | xz --best > DeepBlue-0.1.4-nologos.tar.xz rm -rf DeepBlue DeepBlueDXR3 [ ! -e Aluminium-1.0-demo.tar.bz2 ] && \ @@ -42,5 +42,13 @@ 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/* -tar jcf Aluminium-1.0-demo-nologos.tar.bz2 Aluminium +tar c Aluminium | xz --best > Aluminium-1.0-demo-nologos.tar.xz rm -rf Aluminium + +[ ! -e Skin-EgalsTry-1.1.0.tgz ] && \ +curl -O http://www.egal-vdr.de/skins/Skin-EgalsTry-1.1.0.tgz +rm -rf EgalsTry +tar zxf Skin-EgalsTry-1.1.0.tgz +rm -r EgalsTry/logos/* +tar c EgalsTry | xz --best > Skin-EgalsTry-1.1.0-nologos.tar.xz +rm -rf EgalsTry diff --git a/vdr-skins.spec b/vdr-skins.spec index 28a7fc8..b98f85b 100644 --- a/vdr-skins.spec +++ b/vdr-skins.spec @@ -8,13 +8,9 @@ %global vdr_group %(vdr-config --group 2>/dev/null || echo ERROR) %global vdr_user %(vdr-config --user 2>/dev/null || echo ERROR) -%global sansfont %{_datadir}/fonts/dejavu/DejaVuSans.ttf -%global boldfont %{_datadir}/fonts/dejavu/DejaVuSans-Bold.ttf -%global monofont %{_datadir}/fonts/dejavu/DejaVuSansMono.ttf - Name: vdr-skins -Version: 20081124 -Release: 6%{?dist} +Version: 20090901 +Release: 1%{?dist} Summary: Collection of OSD skins for VDR Group: Applications/Multimedia @@ -25,20 +21,22 @@ License: GPL+ # http://home.arcor.de/bjoern.sturzrehm/vdr/ Source0: http://home.arcor.de/bjoern.sturzrehm/vdr/SilverGreen-0.1.7.tar.bz2 # http://skins.vdr-developer.org/ -Source1: izegrey16-1.0-20050304-nologos.tar.bz2 +Source1: izegrey16-1.0-20050304-nologos.tar.xz # http://home.pages.at/brougs78/ # http://ventoso.org/luca/vdr/ -Source2: vdrskin-enigma-0.3a-nologos.tar.bz2 +Source2: vdrskin-enigma-0.3a-nologos.tar.xz # http://vdr.pfroen.de/ # http://www.netholic.com/viewtopic.php?t=1464 -Source3: DeepBlue-0.1.4-nologos.tar.bz2 +Source3: DeepBlue-0.1.4-nologos.tar.xz # http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/ 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 +Source5: Aluminium-1.0-demo-nologos.tar.xz # http://linux.kompiliert.net/contrib/ Source6: http://linux.kompiliert.net/contrib/EgalSimple-1.0-demo.tar.bz2 +# http://www.egal-vdr.de/skins/ +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 Source99: %{name}-prepare-tarballs.sh @@ -46,15 +44,21 @@ Source99: %{name}-prepare-tarballs.sh Patch0: %{name}-aluminium-i18n.patch Patch1: %{name}-egalsimple-i18n.patch Patch2: %{name}-izegrey16-i18n.patch +Patch3: http://toms-cafe.de/vdr/download/deepblue-0.1.4-locale.diff +Patch4: http://toms-cafe.de/vdr/download/enigma-0.3a-locale.diff +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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: vdr-devel -# Font build deps for checking filenames during build -BuildRequires: dejavu-sans-fonts -BuildRequires: dejavu-sans-mono-fonts -Requires: vdr-text2skin >= 1.1 -Requires: vdr >= 1.4.6-2 +BuildRequires: gettext +BuildRequires: hardlink +Requires: vdr-text2skin >= 1.2-3 +Requires: vdr >= 1.6.0 +# Actually any sans+monospace set would do Requires: dejavu-sans-fonts Requires: dejavu-sans-mono-fonts @@ -63,7 +67,7 @@ This package contains a collection of skins for VDR's on-screen display. %prep -%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 +%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 find . -type d -exec chmod 755 {} ';' find . -type f -exec chmod 644 {} ';' find . -type d -name CVS* | xargs rm -r @@ -75,6 +79,20 @@ done %patch0 %patch1 %patch2 +cd DeepBlue +%patch3 -p2 +cd .. +cd Enigma +%patch4 -p2 +%patch7 -p1 +cd .. +cd enElchi +%patch5 -p2 +cd .. +cd izegrey16 +%patch6 -p0 +cd .. +%patch8 -p0 SKINS=$(find * -maxdepth 0 -type d) @@ -86,12 +104,13 @@ for s in $SKINS ; do done find . -type f -name "*.theme" -exec mv {} . ';' +mv SilverGreen-Default.theme SilverGreen-default.theme +rm SilverGreen-ThemeName.theme for s in $SKINS ; do [ -f $s-default.theme ] || touch $s-default.theme done ln -sf mp3.png Aluminium/replay/mp3oss.png -sed -i -e 's|\bhelmetr\.ttf\b|%{sansfont}|g' Aluminium/Aluminium.skin rm -r Aluminium/{Aluminium.skin.*,MERKEN,fonts} cd DeepBlue @@ -103,11 +122,9 @@ cd .. rm -r EgalSimple/{EgalSimple.skin.*,themes} +rm -r EgalsTry/{theme,tools} + cd Enigma -sed -i -e 's|\bFont\.ttf\b|%{sansfont}|g' \ - -e 's|\bFontBold\.ttf\b|%{boldfont}|g' \ - -e 's|\bFontMonoSpaced\.ttf\b|%{monofont}|g' \ - Enigma.skin rm -r fonts themes *.ttf find . -type f -iname thumbs.db | xargs rm mv icons icons-dxr3 @@ -116,16 +133,14 @@ cd .. rm -rf enElchi/themes -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. -if pkg-config --atleast-version 1.6.0 vdr ; then - find . -name "*.trans" -delete -fi +# *.trans not needed with text2skin >= 1.2 and vdr >= 1.6.0 +find . -name "*.trans" -delete %build +for skin in DeepBlue enElchi Enigma ; do + make -C $skin %{?_smp_mflags} +done %install @@ -142,15 +157,17 @@ 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} - -%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 +for skin in DeepBlue enElchi Enigma ; do + make -C $skin install-i18n DESTDIR=$RPM_BUILD_ROOT LOCDIR=%{_datadir}/locale done +%find_lang %{name} --all-name +# Note: .lang before .themes due to defattr in .themes +cat %{name}.lang %{name}.themes > %{name}.files + +# Save a bit of space +%{_sbindir}/hardlink -cv $RPM_BUILD_ROOT%{_datadir} %clean @@ -180,7 +197,7 @@ if [ $2 -eq 0 ] ; then fi -%files -f %{name}.themes +%files -f %{name}.files %defattr(-,root,root,-) %doc COPYING* HISTORY.* README.* @@ -195,6 +212,8 @@ fi %{datadir}/text2skin/EgalSimple/ +%{datadir}/text2skin/EgalsTry/ + %{datadir}/text2skin/enElchi/ %dir %{datadir}/text2skin/Enigma/ @@ -211,51 +230,60 @@ fi %changelog +* Tue Sep 1 2009 Ville Skyttä - 20090901-1 +- Adapt to recent 1.2+ text2skin versions; patch Aluminium, enigma and izegrey + font handling (no longer filename based font paths, phew). +- Add EgalsTry 1.1.0. +- Apply Thomas Günther's locale patches for DeepBlue, enElchi, and Enigma. +- Drop unused SilverGreen themes, install default properly. +- Recompress cleaned up tarballs with xz. +- Hardlink identical files. + * Sun Jul 26 2009 Fedora Release Engineering - 20081124-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild -* Fri Feb 27 2009 Ville Skyttä - 20081124-5 +* Fri Feb 27 2009 Ville Skyttä - 20081124-5 - More deja vu with dejavu-fonts changes (#480477). - Use %%global instead of %%define. * Wed Feb 25 2009 Fedora Release Engineering - 20081124-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Sat Jan 10 2009 Ville Skyttä - 20081124-3 +* Sat Jan 10 2009 Ville Skyttä - 20081124-3 - Use full DejaVu fonts instead of LGC (#477478). -* Thu Dec 25 2008 Ville Skyttä - 20081124-2 +* Thu Dec 25 2008 Ville Skyttä - 20081124-2 - Use DejaVu fonts for Aluminium and Enigma (#477478). -* Mon Nov 24 2008 Ville Skyttä - 20081124-1 +* Mon Nov 24 2008 Ville Skyttä - 20081124-1 - Update enElchi to 0.7.2. - Catch up again with latest dejavu-fonts changes. -* Mon Apr 7 2008 Ville Skyttä - 20061119-6 +* Mon Apr 7 2008 Ville Skyttä - 20061119-6 - Don't install translations if built for VDR 1.6.0 due to text2skin issues. - Re-add disttag. -* Mon Dec 10 2007 Ville Skyttä - 20061119-5 +* Mon Dec 10 2007 Ville Skyttä - 20061119-5 - Adjust font paths for dejavu-lgc-fonts 2.22+ (#388891). Deja vu, indeed. -* Sun Nov 18 2007 Ville Skyttä - 20061119-4 +* Sun Nov 18 2007 Ville Skyttä - 20061119-4 - Adjust font paths for dejavu-lgc-fonts 2.21+ (#388891). -* Fri Aug 10 2007 Ville Skyttä - 20061119-3 +* Fri Aug 10 2007 Ville Skyttä - 20061119-3 - Use DejaVu LGC fonts instead of Bitstream Vera. - License: GPL+ -* Mon Apr 23 2007 Ville Skyttä - 20061119-2 +* Mon Apr 23 2007 Ville Skyttä - 20061119-2 - Relocate themes to /var/lib/vdr/themes, drop disttag (#216355). - Drop file based dependency on /usr/share/vdr/text2skin. - Fix sttng-blue source URL. -* Sun Nov 19 2006 Ville Skyttä - 20061119-1 +* Sun Nov 19 2006 Ville Skyttä - 20061119-1 - Install skins to /usr/share/vdr/text2skin. - Don't ship channel logos. -* Sun Sep 24 2006 Ville Skyttä - 20060924-1 +* Sun Sep 24 2006 Ville Skyttä - 20060924-1 - Add DXR3 compatible image set for DeepBlue from cccache. -* Sun May 21 2006 Ville Skyttä - 20060311-2 +* Sun May 21 2006 Ville Skyttä - 20060311-2 - Fix some enElchi logos. From 935d9868c9d0b2e250b86f7c81858ad0f3ef55d9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:43:19 +0000 Subject: [PATCH 09/27] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bab502b..847a52f 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: vdr-skins -# $Id$ +# $Id: Makefile,v 1.1 2007/04/23 16:59:04 wtogami Exp $ NAME := vdr-skins SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 0f75f3c6822ca888e72f76da065b4404aef5817b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:12:50 +0000 Subject: [PATCH 10/27] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bab502b..847a52f 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: vdr-skins -# $Id$ +# $Id: Makefile,v 1.1 2007/04/23 16:59:04 wtogami Exp $ NAME := vdr-skins SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 44f7dd7c33dfee51291d97cb0e95ac41ff3546f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:55:50 +0000 Subject: [PATCH 11/27] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 847a52f..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vdr-skins -# $Id: Makefile,v 1.1 2007/04/23 16:59:04 wtogami Exp $ -NAME := vdr-skins -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From ab4aaa51f6beba4a105c469746b931c0b4efe948 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:55:51 +0000 Subject: [PATCH 12/27] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 847a52f..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vdr-skins -# $Id: Makefile,v 1.1 2007/04/23 16:59:04 wtogami Exp $ -NAME := vdr-skins -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9 From 193d16bfe4a1e8ec34d04497d6c975721746cab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 21 Oct 2010 00:23:46 +0300 Subject: [PATCH 13/27] - 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ä - 20101020-1 +- Add anthra_SD 0.2.3 and EgalT2 0.3.3+Finnish patch. + * Tue Sep 1 2009 Ville Skyttä - 20090901-1 - Adapt to recent 1.2+ text2skin versions; patch Aluminium, enigma and izegrey font handling (no longer filename based font paths, phew). From 9e6b008fa4113432bd1acb2e9d8b4adaf368dec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 21 Oct 2010 00:24:30 +0300 Subject: [PATCH 14/27] Add patch forgotten from previous commit. --- vdr-skins-egalt2-finnish.patch | 50 ++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 vdr-skins-egalt2-finnish.patch diff --git a/vdr-skins-egalt2-finnish.patch b/vdr-skins-egalt2-finnish.patch new file mode 100644 index 0000000..c3f83ba --- /dev/null +++ b/vdr-skins-egalt2-finnish.patch @@ -0,0 +1,50 @@ +diff -ru EgalT2/po/fi_FI.po EgalT2.new/po/fi_FI.po +--- EgalT2/po/fi_FI.po 2010-06-12 22:21:38.000000000 +0300 ++++ EgalT2.new/po/fi_FI.po 2010-10-18 20:45:41.633821372 +0300 +@@ -1,23 +1,26 @@ + # VDR language source file. + # Copyright (C) 2008 Klaus Schmidinger + # This file is distributed under the same license as the VDR package. +-# Hannu Savolainen , 2002 +-# Jaakko Hyvätti , 2002, 2003 +-# Niko Tarnanen , 2003 +-# Rolf Ahrenberg , 2003, 2004, 2005, 2006, 2007, 2008 + # ++# Hannu Savolainen , 2002. ++# Jaakko Hyvätti , 2002, 2003. ++# Niko Tarnanen , 2003. ++# Rolf Ahrenberg , 2003, 2004, 2005, 2006, 2007, 2008. ++# Ville Skyttä , 2010. + msgid "" + msgstr "" + "Project-Id-Version: VDR 1.6.0\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2010-06-12 09:59+0200\n" +-"PO-Revision-Date: 2007-08-15 15:52+0200\n" +-"Last-Translator: Rolf Ahrenberg \n" +-"Language-Team: Finnish\n" ++"PO-Revision-Date: 2010-10-18 20:45+0300\n" ++"Last-Translator: Ville Skyttä \n" ++"Language-Team: Finnish \n" + "Language: \n" + "MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=ISO-8859-15\n" ++"Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Lokalize 1.0\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" + + msgid "Recording info" + msgstr "Tallenteen tiedot" +@@ -28,9 +31,9 @@ + msgid "Channels" + msgstr "Kanavat" + +-#, fuzzy + msgid "TimerConflicts" +-msgstr "Ajastimet" ++msgstr "Päällekkäiset ajastimet" + + msgid "Channel" + msgstr "Kanava" ++ From 2d4e511d3463875d21cc01982db495936c114af3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 2 Nov 2010 19:22:34 +0200 Subject: [PATCH 15/27] - Update anthra_SD to 0.2.4. --- .gitignore | 2 +- sources | 2 +- vdr-skins.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7fa84b8..4743efb 100644 --- a/.gitignore +++ b/.gitignore @@ -9,5 +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 +/anthra_SD-0.2.4.tgz diff --git a/sources b/sources index 1a68763..7f1f8c1 100644 --- a/sources +++ b/sources @@ -9,5 +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 +ff6370a1b1157caa62f0dddf32f47806 anthra_SD-0.2.4.tgz diff --git a/vdr-skins.spec b/vdr-skins.spec index 47bec8f..22d7d3b 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: 20101020 +Version: 20101024 Release: 1%{?dist} Summary: Collection of OSD skins for VDR @@ -43,7 +43,7 @@ Source8: http://web.archive.org/web/20060322201106/http://www.magoa.net/s 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 +Source10: http://www.justlinux.de/vdr/anthra_SD-0.2.4.tgz Source99: %{name}-prepare-tarballs.sh Patch0: %{name}-aluminium-i18n.patch @@ -246,6 +246,9 @@ fi %changelog +* Sun Oct 24 2010 Ville Skyttä - 20101024-1 +- Update anthra_SD to 0.2.4. + * Wed Oct 20 2010 Ville Skyttä - 20101020-1 - Add anthra_SD 0.2.3 and EgalT2 0.3.3+Finnish patch. From 250674979f10819825072149c82b3bb22d3898d1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 19:09:10 -0600 Subject: [PATCH 16/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- vdr-skins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-skins.spec b/vdr-skins.spec index 22d7d3b..4abb4fa 100644 --- a/vdr-skins.spec +++ b/vdr-skins.spec @@ -10,7 +10,7 @@ Name: vdr-skins Version: 20101024 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Collection of OSD skins for VDR Group: Applications/Multimedia @@ -246,6 +246,9 @@ fi %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 20101024-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sun Oct 24 2010 Ville Skyttä - 20101024-1 - Update anthra_SD to 0.2.4. From f152666642e8ac3dc7ef2b125034e3e30b145ffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 28 May 2011 17:23:14 +0300 Subject: [PATCH 17/27] Update anthra_SD to 0.2.6; vdrsymbol-fonts is now required. Patch Enigma to use vdrsymbol-fonts. Drop dependency on dejavu-sans-*fonts. --- enigma-0.3a-fonts.patch | 260 ++++++++++++++++----------------- vdr-skins-anthra_SD-make.patch | 12 ++ vdr-skins.spec | 25 ++-- 3 files changed, 158 insertions(+), 139 deletions(-) create mode 100644 vdr-skins-anthra_SD-make.patch diff --git a/enigma-0.3a-fonts.patch b/enigma-0.3a-fonts.patch index 2f0e002..016a087 100644 --- a/enigma-0.3a-fonts.patch +++ b/enigma-0.3a-fonts.patch @@ -9,17 +9,17 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {ChannelNumber} - {ChannelName} - {ChannelName} -+ {ChannelNumber} -+ {ChannelNumber} -+ {ChannelName} -+ {ChannelName} ++ {ChannelNumber} ++ {ChannelNumber} ++ {ChannelName} ++ {ChannelName} - {PresentStartDateTime:%H\:%M} -+ {PresentStartDateTime:%H\:%M} ++ {PresentStartDateTime:%H\:%M} @@ -28,31 +28,31 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {PresentStartDateTime:%H\:%M} -+ {PresentStartDateTime:%H\:%M} ++ {PresentStartDateTime:%H\:%M} - {PresentTitle} -+ {PresentTitle} ++ {PresentTitle} - {PresentTitle} - {PresentShortText} -+ {PresentTitle} -+ {PresentShortText} ++ {PresentTitle} ++ {PresentShortText} - {PresentDuration:%m}' - +{PresentRemaining:%m}' -+ {PresentDuration:%m}' -+ +{PresentRemaining:%m}' ++ {PresentDuration:%m}' ++ +{PresentRemaining:%m}' - {FollowingStartDateTime:%H\:%M} -+ {FollowingStartDateTime:%H\:%M} ++ {FollowingStartDateTime:%H\:%M} @@ -61,22 +61,22 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {FollowingStartDateTime:%H\:%M} -+ {FollowingStartDateTime:%H\:%M} ++ {FollowingStartDateTime:%H\:%M} - {FollowingTitle} -+ {FollowingTitle} ++ {FollowingTitle} - {FollowingTitle} - {FollowingShortText} -+ {FollowingTitle} -+ {FollowingShortText} ++ {FollowingTitle} ++ {FollowingShortText} - {FollowingDuration:%m}' -+ {FollowingDuration:%m}' ++ {FollowingDuration:%m}' @@ -86,8 +86,8 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {DateTime:%d.%m.} - {DateTime:%H\:%M} -+ {DateTime:%d.%m.} -+ {DateTime:%H\:%M} ++ {DateTime:%d.%m.} ++ {DateTime:%H\:%M} @@ -98,9 +98,9 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {AudioTrack} ({AudioChannel} channel) - {AudioTrack} - {AudioChannel} channel -+ {AudioTrack} ({AudioChannel} channel) -+ {AudioTrack} -+ {AudioChannel} channel ++ {AudioTrack} ({AudioChannel} channel) ++ {AudioTrack} ++ {AudioChannel} channel @@ -110,8 +110,8 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {DateTime:%d.%m.} - {DateTime:%H\:%M} -+ {DateTime:%d.%m.} -+ {DateTime:%H\:%M} ++ {DateTime:%d.%m.} ++ {DateTime:%H\:%M} @@ -120,10 +120,10 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {ChannelNumber} - {ChannelName} - {ChannelName} -+ {ChannelNumber} -+ {ChannelNumber} -+ {ChannelName} -+ {ChannelName} ++ {ChannelNumber} ++ {ChannelNumber} ++ {ChannelName} ++ {ChannelName} @@ -134,17 +134,17 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {AudioTrack} ({AudioChannel} channel) - {AudioTrack} - {AudioChannel} channel -+ {AudioTrack} ({AudioChannel} channel) -+ {AudioTrack} -+ {AudioChannel} channel ++ {AudioTrack} ({AudioChannel} channel) ++ {AudioTrack} ++ {AudioChannel} channel - {ChannelName} - {ChannelName} -+ {ChannelName} -+ {ChannelName} ++ {ChannelName} ++ {ChannelName} @@ -154,8 +154,8 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {Message} - {Message} -+ {Message} -+ {Message} ++ {Message} ++ {Message} @@ -167,10 +167,10 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {ChannelNumber} - {ChannelName} - {ChannelName} -+ {ChannelNumber} -+ {ChannelNumber} -+ {ChannelName} -+ {ChannelName} ++ {ChannelNumber} ++ {ChannelNumber} ++ {ChannelName} ++ {ChannelName} @@ -181,17 +181,17 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {AudioTrack} ({AudioChannel} channel) - {AudioTrack} - {AudioChannel} channel -+ {AudioTrack} ({AudioChannel} channel) -+ {AudioTrack} -+ {AudioChannel} channel ++ {AudioTrack} ({AudioChannel} channel) ++ {AudioTrack} ++ {AudioChannel} channel - {ChannelName} - {ChannelName} -+ {ChannelName} -+ {ChannelName} ++ {ChannelName} ++ {ChannelName} @@ -201,8 +201,8 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {DateTime:%d.%m.} - {DateTime:%H\:%M} -+ {DateTime:%d.%m.} -+ {DateTime:%H\:%M} ++ {DateTime:%d.%m.} ++ {DateTime:%H\:%M} @@ -212,8 +212,8 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {Message} - {Message} -+ {Message} -+ {Message} ++ {Message} ++ {Message} @@ -223,8 +223,8 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {ReplayTitle} - {ReplayTitle} -+ {ReplayTitle} -+ {ReplayTitle} ++ {ReplayTitle} ++ {ReplayTitle} @@ -235,9 +235,9 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {ReplayPosition} - {ReplayDuration} - {ReplayPrompt} -+ {ReplayPosition} -+ {ReplayDuration} -+ {ReplayPrompt} ++ {ReplayPosition} ++ {ReplayDuration} ++ {ReplayPrompt} @@ -247,8 +247,8 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {DateTime:%d.%m.} - {DateTime:%H\:%M} -+ {DateTime:%d.%m.} -+ {DateTime:%H\:%M} ++ {DateTime:%d.%m.} ++ {DateTime:%H\:%M} @@ -258,8 +258,8 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {Message} - {Message} -+ {Message} -+ {Message} ++ {Message} ++ {Message} @@ -269,8 +269,8 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {Message} - {Message} -+ {Message} -+ {Message} ++ {Message} ++ {Message} @@ -280,14 +280,14 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {MenuTitle:rest} - {MenuTitle:rest} -+ {MenuTitle:rest} -+ {MenuTitle:rest} ++ {MenuTitle:rest} ++ {MenuTitle:rest} - {MenuTitle:rest} - {MenuTitle:rest} -+ {MenuTitle:rest} -+ {MenuTitle:rest} ++ {MenuTitle:rest} ++ {MenuTitle:rest} @@ -297,13 +297,13 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - VDR - VDR -+ VDR -+ VDR ++ VDR ++ VDR - {MenuTitle} - {MenuTitle} -+ {MenuTitle} -+ {MenuTitle} ++ {MenuTitle} ++ {MenuTitle} @@ -315,10 +315,10 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {MenuItem} - {MenuCurrent} - {MenuCurrent} -+ {MenuGroup} -+ {MenuItem} -+ {MenuCurrent} -+ {MenuCurrent} ++ {MenuGroup} ++ {MenuItem} ++ {MenuCurrent} ++ {MenuCurrent} @@ -330,10 +330,10 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {MenuItem} - {MenuCurrent} - {MenuCurrent} -+ {MenuGroup} -+ {MenuItem} -+ {MenuCurrent} -+ {MenuCurrent} ++ {MenuGroup} ++ {MenuItem} ++ {MenuCurrent} ++ {MenuCurrent} @@ -345,10 +345,10 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {MenuItem} - {MenuCurrent} - {MenuCurrent} -+ {MenuGroup} -+ {MenuItem} -+ {MenuCurrent} -+ {MenuCurrent} ++ {MenuGroup} ++ {MenuItem} ++ {MenuCurrent} ++ {MenuCurrent} @@ -360,10 +360,10 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {MenuItem} - {MenuCurrent} - {MenuCurrent} -+ {MenuGroup} -+ {MenuItem} -+ {MenuCurrent} -+ {MenuCurrent} ++ {MenuGroup} ++ {MenuItem} ++ {MenuCurrent} ++ {MenuCurrent} @@ -373,12 +373,12 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {PresentTitle} - {PresentShortText} -+ {PresentTitle} -+ {PresentShortText} ++ {PresentTitle} ++ {PresentShortText} - {PresentTitle} -+ {PresentTitle} ++ {PresentTitle} @@ -387,14 +387,14 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {PresentStartDateTime:%d.%m.} {PresentStartDateTime:%H\:%M}-{PresentEndDateTime:%H\:%M} ({PresentRemaining:%m}/{PresentDuration:%m}') -+ {PresentStartDateTime:%d.%m.} {PresentStartDateTime:%H\:%M}-{PresentEndDateTime:%H\:%M} ({PresentRemaining:%m}/{PresentDuration:%m}') ++ {PresentStartDateTime:%d.%m.} {PresentStartDateTime:%H\:%M}-{PresentEndDateTime:%H\:%M} ({PresentRemaining:%m}/{PresentDuration:%m}') - {PresentStartDateTime:%d.%m.} {PresentStartDateTime:%H\:%M}-{PresentEndDateTime:%H\:%M} ({PresentDuration:%m}') -+ {PresentStartDateTime:%d.%m.} {PresentStartDateTime:%H\:%M}-{PresentEndDateTime:%H\:%M} ({PresentDuration:%m}') ++ {PresentStartDateTime:%d.%m.} {PresentStartDateTime:%H\:%M}-{PresentEndDateTime:%H\:%M} ({PresentDuration:%m}') @@ -403,11 +403,11 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin color="MenuInfFG" bgColor="SymInactive" path="symbols/vps.xpm"/> - {PresentVPSDateTime:%H\:%M} -+ {PresentVPSDateTime:%H\:%M} ++ {PresentVPSDateTime:%H\:%M} - {PresentDescription} -+ {PresentDescription} ++ {PresentDescription} @@ -417,12 +417,12 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {RecordingTitle} - {RecordingShortText} -+ {RecordingTitle} -+ {RecordingShortText} ++ {RecordingTitle} ++ {RecordingShortText} - {RecordingTitle} -+ {RecordingTitle} ++ {RecordingTitle} @@ -430,16 +430,16 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {RecordingDateTime:%d.%m. %H\:%M} -+ {RecordingDateTime:%d.%m. %H\:%M} ++ {RecordingDateTime:%d.%m. %H\:%M} - {RecordingDescription} -+ {RecordingDescription} ++ {RecordingDescription} @@ -449,7 +449,7 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {MenuText} - {MenuText} -+ {MenuText} ++ {MenuText} + {MenuText} @@ -458,10 +458,10 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - RECORDING: {CurrentRecording} -+ RECORDING: {CurrentRecording} ++ RECORDING: {CurrentRecording} - RECORDINGS: {CurrentRecording} -+ RECORDINGS: {CurrentRecording} ++ RECORDINGS: {CurrentRecording} @@ -471,8 +471,8 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {Message} - {Message} -+ {Message} -+ {Message} ++ {Message} ++ {Message} @@ -482,8 +482,8 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {DateTime:%d.%m.} - {DateTime:%H\:%M} -+ {DateTime:%d.%m.} -+ {DateTime:%H\:%M} ++ {DateTime:%d.%m.} ++ {DateTime:%H\:%M} @@ -491,32 +491,32 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {ButtonRed} - {ButtonRed} -+ {ButtonRed} -+ {ButtonRed} ++ {ButtonRed} ++ {ButtonRed} - {ButtonGreen} - {ButtonGreen} -+ {ButtonGreen} -+ {ButtonGreen} ++ {ButtonGreen} ++ {ButtonGreen} - {ButtonYellow} - {ButtonYellow} -+ {ButtonYellow} -+ {ButtonYellow} ++ {ButtonYellow} ++ {ButtonYellow} - {ButtonBlue} - {ButtonBlue} -+ {ButtonBlue} -+ {ButtonBlue} ++ {ButtonBlue} ++ {ButtonBlue} @@ -526,8 +526,8 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - Volume - Volume -+ Volume -+ Volume ++ Volume ++ Volume @@ -537,8 +537,8 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {DateTime:%d.%m.} - {DateTime:%H\:%M} -+ {DateTime:%d.%m.} -+ {DateTime:%H\:%M} ++ {DateTime:%d.%m.} ++ {DateTime:%H\:%M} @@ -548,8 +548,8 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {Message} - {Message} -+ {Message} -+ {Message} ++ {Message} ++ {Message} @@ -559,8 +559,8 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - Message - Message -+ Message -+ Message ++ Message ++ Message @@ -570,8 +570,8 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {Message} - {Message} -+ {Message} -+ {Message} ++ {Message} ++ {Message} @@ -580,8 +580,8 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {DateTime:%d.%m.} - {DateTime:%H\:%M} -+ {DateTime:%d.%m.} -+ {DateTime:%H\:%M} ++ {DateTime:%d.%m.} ++ {DateTime:%H\:%M} @@ -591,8 +591,8 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - Audio - Audio -+ Audio -+ Audio ++ Audio ++ Audio @@ -600,12 +600,12 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {MenuItem} -+ {MenuItem} ++ {MenuItem} - {MenuCurrent} - {MenuCurrent} -+ {MenuCurrent} -+ {MenuCurrent} ++ {MenuCurrent} ++ {MenuCurrent} @@ -615,7 +615,7 @@ diff -up Enigma/Enigma.skin~ Enigma/Enigma.skin - {DateTime:%d.%m.} - {DateTime:%H\:%M} -+ {DateTime:%d.%m.} -+ {DateTime:%H\:%M} ++ {DateTime:%d.%m.} ++ {DateTime:%H\:%M} diff --git a/vdr-skins-anthra_SD-make.patch b/vdr-skins-anthra_SD-make.patch new file mode 100644 index 0000000..2a5a0a4 --- /dev/null +++ b/vdr-skins-anthra_SD-make.patch @@ -0,0 +1,12 @@ +diff -up anthra_SD/Makefile~ anthra_SD/Makefile +--- anthra_SD/Makefile~ 2010-12-11 20:40:53.000000000 +0200 ++++ anthra_SD/Makefile 2011-02-18 23:56:52.103733715 +0200 +@@ -55,7 +55,7 @@ i18n: $(I18Npo:%.po=$(LOCALEDIR)/%/LC_ME + + $(SKIN).skin: + +- @for FILES in $(wildcard xml/*.xml); do cat "$${FILES}" >> $(SKIN).skin; done ++ @cat xml/*.xml > $(SKIN).skin + + + @echo diff --git a/vdr-skins.spec b/vdr-skins.spec index 4abb4fa..4e0a899 100644 --- a/vdr-skins.spec +++ b/vdr-skins.spec @@ -9,8 +9,8 @@ %global vdr_user %(vdr-config --user 2>/dev/null || echo ERROR) Name: vdr-skins -Version: 20101024 -Release: 2%{?dist} +Version: 20110221 +Release: 1%{?dist} Summary: Collection of OSD skins for VDR Group: Applications/Multimedia @@ -41,9 +41,8 @@ Source7: Skin-EgalsTry-1.1.0-nologos.tar.xz 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.4.tgz +# http://anthra.justlinux.de/common/overview.html +Source10: http://justlinux.de/vdr/anthra_SD-0.2.6.tgz Source99: %{name}-prepare-tarballs.sh Patch0: %{name}-aluminium-i18n.patch @@ -57,6 +56,8 @@ Patch7: enigma-0.3a-fonts.patch Patch8: Aluminium-1.0-demo-fonts.patch # Sent upstream 2010-10-20 Patch9: %{name}-egalt2-finnish.patch +# Sent upstream 2011-02-19 +Patch10: %{name}-anthra_SD-make.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -65,9 +66,8 @@ BuildRequires: gettext BuildRequires: hardlink Requires: vdr-text2skin >= 1.3 Requires: vdr >= 1.6.0 -# Actually any sans+monospace set would do -Requires: dejavu-sans-fonts -Requires: dejavu-sans-mono-fonts +# vdrsymbol-fonts for anthra_SD and Enigma, and "Sans Serif" in others +Requires: vdrsymbol-fonts %description This package contains a collection of skins for VDR's on-screen display. @@ -101,6 +101,7 @@ cd izegrey16 cd .. %patch8 -p0 %patch9 -p0 +%patch10 -p0 SKINS=$(find * -maxdepth 0 -type d) @@ -151,7 +152,7 @@ find . -name "*.trans" -delete %build for skin in anthra_SD DeepBlue EgalT2 enElchi Enigma ; do - make -C $skin %{?_smp_mflags} HDSKIN=0 LOGOSLEFT=0 NOLOGOS=1 + make -C $skin %{?_smp_mflags} HDSKIN=0 done @@ -170,6 +171,7 @@ 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,*.template} +rm -r $RPM_BUILD_ROOT%{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 @@ -246,6 +248,11 @@ fi %changelog +* Mon Feb 21 2011 Ville Skyttä - 20110221-1 +- Update anthra_SD to 0.2.6; vdrsymbol-fonts is now required. +- Patch Enigma to use vdrsymbol-fonts. +- Drop dependency on dejavu-sans-*fonts. + * Mon Feb 07 2011 Fedora Release Engineering - 20101024-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 1a0df1144db79ba4c03931a2607adae232de8009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 28 May 2011 17:27:12 +0300 Subject: [PATCH 18/27] Upload anthra_SD 0.2.6. --- .gitignore | 24 ++++++++++++------------ sources | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 4743efb..3e9d5e9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,13 @@ -Aluminium-1.0-demo-nologos.tar.xz -deepblue-0.1.4-locale.diff -DeepBlue-0.1.4-nologos.tar.xz -EgalSimple-1.0-demo.tar.bz2 -enelchi-0.7.2-locale.diff -enigma-0.3a-locale.diff -izegrey16-1.0-20050304-nologos.tar.xz -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 +/Aluminium-1.0-demo-nologos.tar.xz +/deepblue-0.1.4-locale.diff +/DeepBlue-0.1.4-nologos.tar.xz +/EgalSimple-1.0-demo.tar.bz2 +/enelchi-0.7.2-locale.diff +/enigma-0.3a-locale.diff +/izegrey16-1.0-20050304-nologos.tar.xz +/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 /vdr-text2skin-EgalT2-0.3.3.tar.gz -/anthra_SD-0.2.4.tgz +/anthra_SD-0.2.6.tgz diff --git a/sources b/sources index 7f1f8c1..c5be932 100644 --- a/sources +++ b/sources @@ -10,4 +10,4 @@ edd0fc660e55168a14223b3150e10f1f izegrey16-1.0-20050304-nologos.tar.xz f1913e012a68f8ca7a1feb3da82b8709 vdrskin-enElchi-0.7.2.tgz c4a4a3078cffa557639130af829aeb55 vdrskin-enigma-0.3a-nologos.tar.xz fa173dacd3212fc6dbe0a9440d7a84e4 vdr-text2skin-EgalT2-0.3.3.tar.gz -ff6370a1b1157caa62f0dddf32f47806 anthra_SD-0.2.4.tgz +67248461b3c2c29a8911600bae283df4 anthra_SD-0.2.6.tgz From 94ded0575b7531f01637e45eb2c0264e4cd121f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 4 Nov 2011 20:16:29 +0200 Subject: [PATCH 19/27] Update anthra_SD to 0.2.9. --- .gitignore | 12 ++---------- sources | 2 +- vdr-skins-anthra_SD-make.patch | 12 ------------ vdr-skins.spec | 10 +++++----- 4 files changed, 8 insertions(+), 28 deletions(-) delete mode 100644 vdr-skins-anthra_SD-make.patch diff --git a/.gitignore b/.gitignore index 3e9d5e9..f8f61f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,5 @@ -/Aluminium-1.0-demo-nologos.tar.xz +/*.tar.* +/*.tgz /deepblue-0.1.4-locale.diff -/DeepBlue-0.1.4-nologos.tar.xz -/EgalSimple-1.0-demo.tar.bz2 /enelchi-0.7.2-locale.diff /enigma-0.3a-locale.diff -/izegrey16-1.0-20050304-nologos.tar.xz -/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 -/vdr-text2skin-EgalT2-0.3.3.tar.gz -/anthra_SD-0.2.6.tgz diff --git a/sources b/sources index c5be932..afee436 100644 --- a/sources +++ b/sources @@ -10,4 +10,4 @@ edd0fc660e55168a14223b3150e10f1f izegrey16-1.0-20050304-nologos.tar.xz f1913e012a68f8ca7a1feb3da82b8709 vdrskin-enElchi-0.7.2.tgz c4a4a3078cffa557639130af829aeb55 vdrskin-enigma-0.3a-nologos.tar.xz fa173dacd3212fc6dbe0a9440d7a84e4 vdr-text2skin-EgalT2-0.3.3.tar.gz -67248461b3c2c29a8911600bae283df4 anthra_SD-0.2.6.tgz +43c967bf79f7f84e3245606121428e61 anthra_SD-0.2.9.tgz diff --git a/vdr-skins-anthra_SD-make.patch b/vdr-skins-anthra_SD-make.patch deleted file mode 100644 index 2a5a0a4..0000000 --- a/vdr-skins-anthra_SD-make.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up anthra_SD/Makefile~ anthra_SD/Makefile ---- anthra_SD/Makefile~ 2010-12-11 20:40:53.000000000 +0200 -+++ anthra_SD/Makefile 2011-02-18 23:56:52.103733715 +0200 -@@ -55,7 +55,7 @@ i18n: $(I18Npo:%.po=$(LOCALEDIR)/%/LC_ME - - $(SKIN).skin: - -- @for FILES in $(wildcard xml/*.xml); do cat "$${FILES}" >> $(SKIN).skin; done -+ @cat xml/*.xml > $(SKIN).skin - - - @echo diff --git a/vdr-skins.spec b/vdr-skins.spec index 4e0a899..b358c6e 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: 20110221 +Version: 20111104 Release: 1%{?dist} Summary: Collection of OSD skins for VDR @@ -42,7 +42,7 @@ Source8: http://web.archive.org/web/20060322201106/http://www.magoa.net/s # http://www.egal-vdr.de/skins/ Source9: http://www.egal-vdr.de/skins/vdr-text2skin-EgalT2-0.3.3.tar.gz # http://anthra.justlinux.de/common/overview.html -Source10: http://justlinux.de/vdr/anthra_SD-0.2.6.tgz +Source10: http://justlinux.de/vdr/anthra_SD/anthra_SD-0.2.9.tgz Source99: %{name}-prepare-tarballs.sh Patch0: %{name}-aluminium-i18n.patch @@ -56,8 +56,6 @@ Patch7: enigma-0.3a-fonts.patch Patch8: Aluminium-1.0-demo-fonts.patch # Sent upstream 2010-10-20 Patch9: %{name}-egalt2-finnish.patch -# Sent upstream 2011-02-19 -Patch10: %{name}-anthra_SD-make.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -101,7 +99,6 @@ cd izegrey16 cd .. %patch8 -p0 %patch9 -p0 -%patch10 -p0 SKINS=$(find * -maxdepth 0 -type d) @@ -248,6 +245,9 @@ fi %changelog +* Fri Nov 4 2011 Ville Skyttä - 20111104-1 +- Update anthra_SD to 0.2.9. + * Mon Feb 21 2011 Ville Skyttä - 20110221-1 - Update anthra_SD to 0.2.6; vdrsymbol-fonts is now required. - Patch Enigma to use vdrsymbol-fonts. From 672fdf05b205d10437ee1428f7c85e5174f30d7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 4 Nov 2011 20:44:54 +0200 Subject: [PATCH 20/27] Specfile cleanups. --- vdr-skins.spec | 84 ++++++++++++++++++++++---------------------------- 1 file 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ä - 20111104-1 - Update anthra_SD to 0.2.9. +- Specfile cleanups. * Mon Feb 21 2011 Ville Skyttä - 20110221-1 - Update anthra_SD to 0.2.6; vdrsymbol-fonts is now required. From 75ac7be1a88a66dadf95a13fe6816bae12831aa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 5 Nov 2011 12:34:21 +0200 Subject: [PATCH 21/27] Update anthra_SD to 0.2.9a. --- sources | 2 +- vdr-skins.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index afee436..2845abe 100644 --- a/sources +++ b/sources @@ -10,4 +10,4 @@ edd0fc660e55168a14223b3150e10f1f izegrey16-1.0-20050304-nologos.tar.xz f1913e012a68f8ca7a1feb3da82b8709 vdrskin-enElchi-0.7.2.tgz c4a4a3078cffa557639130af829aeb55 vdrskin-enigma-0.3a-nologos.tar.xz fa173dacd3212fc6dbe0a9440d7a84e4 vdr-text2skin-EgalT2-0.3.3.tar.gz -43c967bf79f7f84e3245606121428e61 anthra_SD-0.2.9.tgz +f6cced44a7cf0a9f1c0e2454c74279c6 anthra_SD-0.2.9a.tgz diff --git a/vdr-skins.spec b/vdr-skins.spec index f2b9cff..d164f01 100644 --- a/vdr-skins.spec +++ b/vdr-skins.spec @@ -4,7 +4,7 @@ # - manage symlinks with alternatives? Name: vdr-skins -Version: 20111104 +Version: 20111105 Release: 1%{?dist} Summary: Collection of OSD skins for VDR @@ -37,7 +37,7 @@ Source8: http://web.archive.org/web/20060322201106/http://www.magoa.net/s # http://www.egal-vdr.de/skins/ Source9: http://www.egal-vdr.de/skins/vdr-text2skin-EgalT2-0.3.3.tar.gz # http://anthra.justlinux.de/common/overview.html -Source10: http://justlinux.de/vdr/anthra_SD/anthra_SD-0.2.9.tgz +Source10: http://justlinux.de/vdr/anthra_SD/anthra_SD-0.2.9a.tgz Source99: %{name}-prepare-tarballs.sh Patch0: %{name}-aluminium-i18n.patch @@ -234,6 +234,9 @@ fi %changelog +* Sat Nov 5 2011 Ville Skyttä - 20111105-1 +- Update anthra_SD to 0.2.9a. + * Fri Nov 4 2011 Ville Skyttä - 20111104-1 - Update anthra_SD to 0.2.9. - Specfile cleanups. From d571bb54c470ab57f5a97ef254be353a1bcb381e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 01:47:47 -0600 Subject: [PATCH 22/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- vdr-skins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-skins.spec b/vdr-skins.spec index d164f01..46b096e 100644 --- a/vdr-skins.spec +++ b/vdr-skins.spec @@ -5,7 +5,7 @@ Name: vdr-skins Version: 20111105 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Collection of OSD skins for VDR Group: Applications/Multimedia @@ -234,6 +234,9 @@ fi %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 20111105-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sat Nov 5 2011 Ville Skyttä - 20111105-1 - Update anthra_SD to 0.2.9a. From 51a3ca4c20da1d1e75cedd9d616c68a23dd84428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 18 Jun 2012 00:32:49 +0300 Subject: [PATCH 23/27] 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 file 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ä - 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 - 20111105-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 95757ae0867aad6c636100d0efb19787ef4edf0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 17 Jul 2012 21:38:06 +0300 Subject: [PATCH 24/27] Make sure %pre scriptlet exits with zero status (#840943). --- vdr-skins.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vdr-skins.spec b/vdr-skins.spec index c24d3e8..20febc1 100644 --- a/vdr-skins.spec +++ b/vdr-skins.spec @@ -5,7 +5,7 @@ Name: vdr-skins Version: 20111105 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Collection of OSD skins for VDR License: GPL+ @@ -175,7 +175,7 @@ cat %{name}.lang %{name}.themes > %{name}.files %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 +[ $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 @@ -224,6 +224,9 @@ done %changelog +* Tue Jul 17 2012 Ville Skyttä - 20111105-4 +- Make sure %%pre scriptlet exits with zero status (#840943). + * Sun Jun 17 2012 Ville Skyttä - 20111105-3 - Don't try to symlink to nonexistent DeepBlue/logos-dxr3. - Clean up specfile constructs no longer needed with Fedora or EL6+. From d9403e7744cfc8c6c86aa94a90b293e951533572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 13 Sep 2012 21:21:23 +0300 Subject: [PATCH 25/27] Adapt to VDR 1.7.30. --- vdr-skins.spec | 63 ++++++++++++++++++++++++++------------------------ 1 file 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ä - 20111105-5 +- Adapt to VDR 1.7.30. + * Tue Jul 17 2012 Ville Skyttä - 20111105-4 - Make sure %%pre scriptlet exits with zero status (#840943). From f6a4cfb69183408e59566315cc66592012755a0f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 20:41:23 -0600 Subject: [PATCH 26/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- vdr-skins.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vdr-skins.spec b/vdr-skins.spec index 15f1fc1..f824065 100644 --- a/vdr-skins.spec +++ b/vdr-skins.spec @@ -5,7 +5,7 @@ Name: vdr-skins Version: 20111105 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Collection of OSD skins for VDR License: GPL+ @@ -224,6 +224,9 @@ done %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 20111105-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Sep 13 2012 Ville Skyttä - 20111105-5 - Adapt to VDR 1.7.30. From 9d93ede007db5c3d5e2d3edfed65ad5293080667 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 12 Mar 2013 00:26:25 -0400 Subject: [PATCH 27/27] Retire vdr-skins - no maintainer --- Aluminium-1.0-demo-fonts.patch | 21 - dead.package | 1 + enigma-0.3a-fonts.patch | 621 ----------------------------- izegrey16-1.0-20050304-fonts.patch | 214 ---------- sources | 13 - sttng-blue.theme | 62 --- vdr-skins-aluminium-i18n.patch | 12 - vdr-skins-egalsimple-i18n.patch | 7 - vdr-skins-egalt2-finnish.patch | 50 --- vdr-skins-izegrey16-i18n.patch | 8 - vdr-skins-prepare-tarballs.sh | 54 --- vdr-skins.spec | 320 --------------- 12 files changed, 1 insertion(+), 1382 deletions(-) delete mode 100644 Aluminium-1.0-demo-fonts.patch create mode 100644 dead.package delete mode 100644 enigma-0.3a-fonts.patch delete mode 100644 izegrey16-1.0-20050304-fonts.patch delete mode 100644 sources delete mode 100644 sttng-blue.theme delete mode 100644 vdr-skins-aluminium-i18n.patch delete mode 100644 vdr-skins-egalsimple-i18n.patch delete mode 100644 vdr-skins-egalt2-finnish.patch delete mode 100644 vdr-skins-izegrey16-i18n.patch delete mode 100644 vdr-skins-prepare-tarballs.sh delete mode 100644 vdr-skins.spec diff --git a/Aluminium-1.0-demo-fonts.patch b/Aluminium-1.0-demo-fonts.patch deleted file mode 100644 index 8bb2976..0000000 --- a/Aluminium-1.0-demo-fonts.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up Aluminium/Aluminium.skin~ Aluminium/Aluminium.skin ---- Aluminium/Aluminium.skin~ 2004-12-08 20:45:13.000000000 +0200 -+++ Aluminium/Aluminium.skin 2009-07-13 00:04:06.000000000 +0300 -@@ -155,7 +155,7 @@ - {PresentTitle} - {PresentStartDateTime:%d.%m. %H\:%M} - {PresentEndDateTime:%H\:%M} - VPS: {PresentVPSDateTime:%H\:%M} -- -+ - {PresentShortText} - {PresentDescription} - -- {ChannelNumber} -- {ChannelNumber} -- {ChannelName} -- {ChannelName} -+ {ChannelNumber} -+ {ChannelNumber} -+ {ChannelName} -+ {ChannelName} - - - - - -- {PresentStartDateTime:%H\:%M} -+ {PresentStartDateTime:%H\:%M} - - - -@@ -72,25 +72,25 @@ - - - -- {PresentStartDateTime:%H\:%M} -+ {PresentStartDateTime:%H\:%M} - - - -- {PresentTitle} -+ {PresentTitle} - - -- {PresentTitle} -- {PresentShortText} -+ {PresentTitle} -+ {PresentShortText} - - -- {PresentDuration:%m}' -- +{PresentRemaining:%m}' -+ {PresentDuration:%m}' -+ +{PresentRemaining:%m}' - - - - - -- {FollowingStartDateTime:%H\:%M} -+ {FollowingStartDateTime:%H\:%M} - - - -@@ -98,18 +98,18 @@ - - - -- {FollowingStartDateTime:%H\:%M} -+ {FollowingStartDateTime:%H\:%M} - - - -- {FollowingTitle} -+ {FollowingTitle} - - -- {FollowingTitle} -- {FollowingShortText} -+ {FollowingTitle} -+ {FollowingShortText} - - -- {FollowingDuration:%m}' -+ {FollowingDuration:%m}' - - - -@@ -117,8 +117,8 @@ - - - -- {DateTime:%d.%m.} -- {DateTime:%H\:%M} -+ {DateTime:%d.%m.} -+ {DateTime:%H\:%M} - - - -@@ -156,9 +156,9 @@ - - - -- {AudioTrack} ({AudioChannel} channel) -- {AudioTrack} -- {AudioChannel} channel -+ {AudioTrack} ({AudioChannel} channel) -+ {AudioTrack} -+ {AudioChannel} channel - - - -@@ -179,16 +179,16 @@ - - - -- {DateTime:%d.%m.} -- {DateTime:%H\:%M} -+ {DateTime:%d.%m.} -+ {DateTime:%H\:%M} - - - - -- {ChannelNumber} -- {ChannelNumber} -- {ChannelName} -- {ChannelName} -+ {ChannelNumber} -+ {ChannelNumber} -+ {ChannelName} -+ {ChannelName} - - - -@@ -210,15 +210,15 @@ - - - -- {AudioTrack} ({AudioChannel} channel) -- {AudioTrack} -- {AudioChannel} channel -+ {AudioTrack} ({AudioChannel} channel) -+ {AudioTrack} -+ {AudioChannel} channel - - - - -- {ChannelName} -- {ChannelName} -+ {ChannelName} -+ {ChannelName} - - - -@@ -232,8 +232,8 @@ - - - -- {Message} -- {Message} -+ {Message} -+ {Message} - - - -@@ -269,10 +269,10 @@ - - - -- {ChannelNumber} -- {ChannelNumber} -- {ChannelName} -- {ChannelName} -+ {ChannelNumber} -+ {ChannelNumber} -+ {ChannelName} -+ {ChannelName} - - - -@@ -294,15 +294,15 @@ - - - -- {AudioTrack} ({AudioChannel} channel) -- {AudioTrack} -- {AudioChannel} channel -+ {AudioTrack} ({AudioChannel} channel) -+ {AudioTrack} -+ {AudioChannel} channel - - - - -- {ChannelName} -- {ChannelName} -+ {ChannelName} -+ {ChannelName} - - - -@@ -313,8 +313,8 @@ - - - -- {DateTime:%d.%m.} -- {DateTime:%H\:%M} -+ {DateTime:%d.%m.} -+ {DateTime:%H\:%M} - - - -@@ -326,8 +326,8 @@ - - - -- {Message} -- {Message} -+ {Message} -+ {Message} - - - -@@ -385,8 +385,8 @@ - - - -- {ReplayTitle} -- {ReplayTitle} -+ {ReplayTitle} -+ {ReplayTitle} - - - -@@ -409,9 +409,9 @@ - - - -- {ReplayPosition} -- {ReplayDuration} -- {ReplayPrompt} -+ {ReplayPosition} -+ {ReplayDuration} -+ {ReplayPrompt} - - - -@@ -419,8 +419,8 @@ - - - -- {DateTime:%d.%m.} -- {DateTime:%H\:%M} -+ {DateTime:%d.%m.} -+ {DateTime:%H\:%M} - - - -@@ -432,8 +432,8 @@ - - - -- {Message} -- {Message} -+ {Message} -+ {Message} - - - -@@ -490,8 +490,8 @@ - - - -- {Message} -- {Message} -+ {Message} -+ {Message} - - - -@@ -518,12 +518,12 @@ - - - -- {MenuTitle:rest} -- {MenuTitle:rest} -+ {MenuTitle:rest} -+ {MenuTitle:rest} - - -- {MenuTitle:rest} -- {MenuTitle:rest} -+ {MenuTitle:rest} -+ {MenuTitle:rest} - - - -@@ -620,11 +620,11 @@ - - - -- VDR -- VDR -+ VDR -+ VDR - -- {MenuTitle} -- {MenuTitle} -+ {MenuTitle} -+ {MenuTitle} - - - -@@ -640,10 +640,10 @@ - - - -- {MenuGroup} -- {MenuItem} -- {MenuCurrent} -- {MenuCurrent} -+ {MenuGroup} -+ {MenuItem} -+ {MenuCurrent} -+ {MenuCurrent} - - - -@@ -655,10 +655,10 @@ - - - -- {MenuGroup} -- {MenuItem} -- {MenuCurrent} -- {MenuCurrent} -+ {MenuGroup} -+ {MenuItem} -+ {MenuCurrent} -+ {MenuCurrent} - - - -@@ -673,10 +673,10 @@ - - - -- {MenuGroup} -- {MenuItem} -- {MenuCurrent} -- {MenuCurrent} -+ {MenuGroup} -+ {MenuItem} -+ {MenuCurrent} -+ {MenuCurrent} - - - -@@ -690,10 +690,10 @@ - - - -- {MenuGroup} -- {MenuItem} -- {MenuCurrent} -- {MenuCurrent} -+ {MenuGroup} -+ {MenuItem} -+ {MenuCurrent} -+ {MenuCurrent} - - - -@@ -703,11 +703,11 @@ - - - -- {PresentTitle} -- {PresentShortText} -+ {PresentTitle} -+ {PresentShortText} - - -- {PresentTitle} -+ {PresentTitle} - - - -@@ -718,13 +718,13 @@ - - - -- {PresentStartDateTime:%d.%m.} {PresentStartDateTime:%H\:%M}-{PresentEndDateTime:%H\:%M} ({PresentRemaining:%m}/{PresentDuration:%m}') -+ {PresentStartDateTime:%d.%m.} {PresentStartDateTime:%H\:%M}-{PresentEndDateTime:%H\:%M} ({PresentRemaining:%m}/{PresentDuration:%m}') - - - - - -- {PresentStartDateTime:%d.%m.} {PresentStartDateTime:%H\:%M}-{PresentEndDateTime:%H\:%M} ({PresentDuration:%m}') -+ {PresentStartDateTime:%d.%m.} {PresentStartDateTime:%H\:%M}-{PresentEndDateTime:%H\:%M} ({PresentDuration:%m}') - - - -@@ -734,10 +734,10 @@ - - -- {PresentVPSDateTime:%H\:%M} -+ {PresentVPSDateTime:%H\:%M} - - -- {PresentDescription} -+ {PresentDescription} - - - -@@ -747,25 +747,25 @@ - - - -- {RecordingTitle} -- {RecordingShortText} -+ {RecordingTitle} -+ {RecordingShortText} - - -- {RecordingTitle} -+ {RecordingTitle} - - - - - - -- {RecordingDateTime:%d.%m. %H\:%M} -+ {RecordingDateTime:%d.%m. %H\:%M} - - - - -- {RecordingDescription} -+ {RecordingDescription} - - - -@@ -774,17 +774,17 @@ - - - -- {MenuText} -- {MenuText} -+ {MenuText} -+ {MenuText} - - - - - - -- RECORDING: {CurrentRecording} -+ RECORDING: {CurrentRecording} - -- RECORDINGS: {CurrentRecording} -+ RECORDINGS: {CurrentRecording} - - - -@@ -798,8 +798,8 @@ - - - -- {Message} -- {Message} -+ {Message} -+ {Message} - - - -@@ -809,33 +809,33 @@ - - - -- {DateTime:%d.%m.} -- {DateTime:%H\:%M} -+ {DateTime:%d.%m.} -+ {DateTime:%H\:%M} - - - - - -- {ButtonRed} -- {ButtonRed} -+ {ButtonRed} -+ {ButtonRed} - - - - -- {ButtonGreen} -- {ButtonGreen} -+ {ButtonGreen} -+ {ButtonGreen} - - - - -- {ButtonYellow} -- {ButtonYellow} -+ {ButtonYellow} -+ {ButtonYellow} - - - - -- {ButtonBlue} -- {ButtonBlue} -+ {ButtonBlue} -+ {ButtonBlue} - - - -@@ -868,8 +868,8 @@ - - - -- Volume -- Volume -+ Volume -+ Volume - - - -@@ -882,8 +882,8 @@ - - - -- {DateTime:%d.%m.} -- {DateTime:%H\:%M} -+ {DateTime:%d.%m.} -+ {DateTime:%H\:%M} - - - -@@ -895,8 +895,8 @@ - - - -- {Message} -- {Message} -+ {Message} -+ {Message} - - - -@@ -918,8 +918,8 @@ - - - -- Message -- Message -+ Message -+ Message - - - -@@ -932,16 +932,16 @@ - - - -- {Message} -- {Message} -+ {Message} -+ {Message} - - - - - - -- {DateTime:%d.%m.} -- {DateTime:%H\:%M} -+ {DateTime:%d.%m.} -+ {DateTime:%H\:%M} - - - -@@ -969,18 +969,18 @@ - - - -- Audio -- Audio -+ Audio -+ Audio - - - - - - -- {MenuItem} -+ {MenuItem} - -- {MenuCurrent} -- {MenuCurrent} -+ {MenuCurrent} -+ {MenuCurrent} - - - -@@ -990,7 +990,7 @@ - - - -- {DateTime:%d.%m.} -- {DateTime:%H\:%M} -+ {DateTime:%d.%m.} -+ {DateTime:%H\:%M} - - diff --git a/izegrey16-1.0-20050304-fonts.patch b/izegrey16-1.0-20050304-fonts.patch deleted file mode 100644 index 604d4b7..0000000 --- a/izegrey16-1.0-20050304-fonts.patch +++ /dev/null @@ -1,214 +0,0 @@ -Index: izegrey16.skin -=================================================================== -RCS file: /var/cvsroot/skins/izegrey16/izegrey16.skin,v -retrieving revision 1.1 -diff -u -r1.1 izegrey16.skin ---- izegrey16.skin 4 Mar 2005 18:41:46 -0000 1.1 -+++ izegrey16.skin 12 Jul 2009 20:11:18 -0000 -@@ -7,7 +7,7 @@ - - - -- Volume -+ Volume - - - -@@ -16,10 +16,10 @@ - - - -- {MessageInfo} -- {MessageStatus} -- {MessageWarning} -- {MessageError} -+ {MessageInfo} -+ {MessageStatus} -+ {MessageWarning} -+ {MessageError} - - - -@@ -30,8 +30,8 @@ - - - -- {ReplayTitle} -- {ReplayPosition} / {ReplayDuration} -+ {ReplayTitle} -+ {ReplayPosition} / {ReplayDuration} - - - -@@ -85,21 +85,21 @@ - - - -- {ChannelNumber} -+ {ChannelNumber} - - -- {DateTime:%a %d.%m.} -- {DateTime:%H\:%M} -+ {DateTime:%a %d.%m.} -+ {DateTime:%H\:%M} - - - -- {ChannelName} -+ {ChannelName} - - - - -- {PresentStartDateTime:%H\:%M} -- {FollowingStartDateTime:%H\:%M} -+ {PresentStartDateTime:%H\:%M} -+ {FollowingStartDateTime:%H\:%M} - - - -@@ -107,10 +107,10 @@ - - - -- {PresentTitle} -- {PresentShortText} -- {FollowingTitle} -- {FollowingShortText} -+ {PresentTitle} -+ {PresentShortText} -+ {FollowingTitle} -+ {FollowingShortText} - - - -@@ -132,8 +132,8 @@ - - - -- {DateTime:%a %d.%m. %H\:%M} -- {MenuTitle} -+ {DateTime:%a %d.%m. %H\:%M} -+ {MenuTitle} - - - -@@ -141,41 +141,41 @@ - - - -- {MenuGroup} -- {MenuCurrent} -- {MenuItem} -+ {MenuGroup} -+ {MenuCurrent} -+ {MenuItem} - - - - - - -- {ButtonRed} -+ {ButtonRed} - - - - -- {ButtonGreen} -+ {ButtonGreen} - - - - - -- {ButtonYellow} -+ {ButtonYellow} - - - - - - -- {ButtonBlue} -+ {ButtonBlue} - - - -- {PresentStartDateTime:%d.%m. %H\:%M} - {PresentEndDateTime:%H\:%M} -- VPS: {PresentVPSDateTime:%H\:%M} -- {PresentTitle} -- {PresentShortText}{PresentDescription} -+ {PresentStartDateTime:%d.%m. %H\:%M} - {PresentEndDateTime:%H\:%M} -+ VPS: {PresentVPSDateTime:%H\:%M} -+ {PresentTitle} -+ {PresentShortText}{PresentDescription} - - - -@@ -183,7 +183,7 @@ - - - -- {MenuText} -+ {MenuText} - - - -@@ -192,28 +192,28 @@ - - - -- {MessageInfo} -+ {MessageInfo} - - - - - - -- {MessageStatus} -+ {MessageStatus} - - - - - - -- {MessageWarning} -+ {MessageWarning} - - - - - - -- {MessageError} -+ {MessageError} - - - -@@ -225,7 +225,7 @@ - - - -- {MenuTitle} -+ {MenuTitle} - - - -@@ -234,11 +234,11 @@ - - - -- {MenuItem} -+ {MenuItem} - - - -- {MenuCurrent} -+ {MenuCurrent} - - - diff --git a/sources b/sources deleted file mode 100644 index 2845abe..0000000 --- a/sources +++ /dev/null @@ -1,13 +0,0 @@ -00a37ab75fcadeb46385d585938bfe56 Aluminium-1.0-demo-nologos.tar.xz -b4982b8a9900897f215eadab0acef6db deepblue-0.1.4-locale.diff -46bf3259b319df37a0d532020a9d9f74 DeepBlue-0.1.4-nologos.tar.xz -8676ae6f7596d7c09fbdec7468709bbc EgalSimple-1.0-demo.tar.bz2 -6d25e2376a348596ffc4c35ad4480606 enelchi-0.7.2-locale.diff -9a305465f90e9ce1e52b4238df8489b0 enigma-0.3a-locale.diff -edd0fc660e55168a14223b3150e10f1f izegrey16-1.0-20050304-nologos.tar.xz -89dd82fa698d139a15c4d24601188a0c SilverGreen-0.1.7.tar.bz2 -9ded71faf87400a031a18b8315909cb4 Skin-EgalsTry-1.1.0-nologos.tar.xz -f1913e012a68f8ca7a1feb3da82b8709 vdrskin-enElchi-0.7.2.tgz -c4a4a3078cffa557639130af829aeb55 vdrskin-enigma-0.3a-nologos.tar.xz -fa173dacd3212fc6dbe0a9440d7a84e4 vdr-text2skin-EgalT2-0.3.3.tar.gz -f6cced44a7cf0a9f1c0e2454c74279c6 anthra_SD-0.2.9a.tgz diff --git a/sttng-blue.theme b/sttng-blue.theme deleted file mode 100644 index 62db27e..0000000 --- a/sttng-blue.theme +++ /dev/null @@ -1,62 +0,0 @@ -Description = Blue LCARS -clrBackground = 7F000000 -clrButtonRedFg = FFFCFCFC -clrButtonRedBg = FFFC1414 -clrButtonGreenFg = FF000000 -clrButtonGreenBg = FF24FC24 -clrButtonYellowFg = FF000000 -clrButtonYellowBg = FFFCC024 -clrButtonBlueFg = FFFCFCFC -clrButtonBlueBg = FF0000FC -clrMessageFrame = FF598ACD -clrMessageStatusFg = FF000000 -clrMessageStatusBg = FF00FCFC -clrMessageInfoFg = FF000000 -clrMessageInfoBg = FF9C9CFF -clrMessageWarningFg = FF000000 -clrMessageWarningBg = FFFCC024 -clrMessageErrorFg = FFFCFCFC -clrMessageErrorBg = FFFC1414 -clrVolumeFrame = FF598ACD -clrVolumeSymbol = FF000000 -clrVolumeBarUpper = FF38359E -clrVolumeBarLower = FF9FCEFF -clrChannelFrame = FF598ACD -clrChannelName = FF000000 -clrChannelDate = FF000000 -clrChannelSymbolOn = FF000000 -clrChannelSymbolOff = FF5A7CA2 -clrChannelSymbolRecFg = FFFCFCFC -clrChannelSymbolRecBg = FFFC1414 -clrChannelEpgTime = FF000000 -clrChannelEpgTitle = FF00FCFC -clrChannelEpgShortText = FFFCC024 -clrChannelTimebarSeen = FF38359E -clrChannelTimebarRest = FF9FCEFF -clrMenuFrame = FF598ACD -clrMenuTitle = FF000000 -clrMenuDate = FF000000 -clrMenuItemCurrentFg = FF000000 -clrMenuItemCurrentBg = FF9C9CFF -clrMenuItemSelectable = FF9C9CFF -clrMenuItemNonSelectable = FF00FCFC -clrMenuEventTime = FFFCC024 -clrMenuEventVps = FF000000 -clrMenuEventTitle = FF00FCFC -clrMenuEventShortText = FFFCC024 -clrMenuEventDescription = FF00FCFC -clrMenuScrollbarTotal = FF38359E -clrMenuScrollbarShown = FF00FCFC -clrMenuScrollbarArrow = FF000000 -clrMenuText = FF00FCFC -clrReplayFrame = FF598ACD -clrReplayTitle = FF000000 -clrReplayMode = FF000000 -clrReplayCurrent = FF000000 -clrReplayTotal = FF000000 -clrReplayJump = FF000000 -clrReplayProgressSeen = FF9FCEFF -clrReplayProgressRest = FF38359E -clrReplayProgressSelected = FFFC1414 -clrReplayProgressMark = FF000000 -clrReplayProgressCurrent = FFFC1414 diff --git a/vdr-skins-aluminium-i18n.patch b/vdr-skins-aluminium-i18n.patch deleted file mode 100644 index ebbbebf..0000000 --- a/vdr-skins-aluminium-i18n.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- Aluminium/Aluminium.trans.orig 2005-10-22 21:01:28.000000000 +0300 -+++ Aluminium/Aluminium.trans 2005-10-22 21:02:11.000000000 +0300 -@@ -1,3 +1,7 @@ --Item=Translation,eng=Total:,deu=Gesamt:; -+Item=Translation,eng=Total:,deu=Gesamt:,fin=Yhteensä:; - Item=Translation,eng=Current:,deu=Aktuell:; --Item=Translation,eng=-,deu=-; -+Item=Translation,eng=-,deu=-,fin=-; -+Item=Translation,eng={PresentStartDateTime:%d.%m. %H\:%M} - {PresentEndDateTime:%H\:%M},deu={PresentStartDateTime:%d.%m. %H\:%M} - {PresentEndDateTime:%H\:%M},fin={PresentStartDateTime:%d.%m. %H\:%M} - {PresentEndDateTime:%H\:%M}; -+Item=Translation,eng=VPS: {PresentVPSDateTime:%H\:%M},deu=VPS: {PresentVPSDateTime:%H\:%M},fin=VPS: {PresentVPSDateTime:%H\:%M}; -+Item=Translation,eng={PresentShortText} {PresentDescription},deu={PresentShortText} {PresentDescription},fin={PresentShortText} {PresentDescription}; -+Item=Translation,eng=->,deu=->,fin=->; diff --git a/vdr-skins-egalsimple-i18n.patch b/vdr-skins-egalsimple-i18n.patch deleted file mode 100644 index 1bb56c4..0000000 --- a/vdr-skins-egalsimple-i18n.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- EgalSimple/EgalSimple.trans~ 2004-10-27 18:40:25.000000000 +0300 -+++ EgalSimple/EgalSimple.trans 2005-10-22 20:53:10.000000000 +0300 -@@ -13,3 +13,4 @@ - Item=Translation,eng=R,deu=R,fin=R; - Item=Translation,eng=p,deu=p,fin=p; - Item=Translation,eng=Volume,deu=Lautstärke,fin=Äanenvoimakk.; -+Item=Translation,eng={PresentShortText} {PresentDescription},deu={PresentShortText} {PresentDescription},fin={PresentShortText} {PresentDescription}; diff --git a/vdr-skins-egalt2-finnish.patch b/vdr-skins-egalt2-finnish.patch deleted file mode 100644 index c3f83ba..0000000 --- a/vdr-skins-egalt2-finnish.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -ru EgalT2/po/fi_FI.po EgalT2.new/po/fi_FI.po ---- EgalT2/po/fi_FI.po 2010-06-12 22:21:38.000000000 +0300 -+++ EgalT2.new/po/fi_FI.po 2010-10-18 20:45:41.633821372 +0300 -@@ -1,23 +1,26 @@ - # VDR language source file. - # Copyright (C) 2008 Klaus Schmidinger - # This file is distributed under the same license as the VDR package. --# Hannu Savolainen , 2002 --# Jaakko Hyvätti , 2002, 2003 --# Niko Tarnanen , 2003 --# Rolf Ahrenberg , 2003, 2004, 2005, 2006, 2007, 2008 - # -+# Hannu Savolainen , 2002. -+# Jaakko Hyvätti , 2002, 2003. -+# Niko Tarnanen , 2003. -+# Rolf Ahrenberg , 2003, 2004, 2005, 2006, 2007, 2008. -+# Ville Skyttä , 2010. - msgid "" - msgstr "" - "Project-Id-Version: VDR 1.6.0\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2010-06-12 09:59+0200\n" --"PO-Revision-Date: 2007-08-15 15:52+0200\n" --"Last-Translator: Rolf Ahrenberg \n" --"Language-Team: Finnish\n" -+"PO-Revision-Date: 2010-10-18 20:45+0300\n" -+"Last-Translator: Ville Skyttä \n" -+"Language-Team: Finnish \n" - "Language: \n" - "MIME-Version: 1.0\n" --"Content-Type: text/plain; charset=ISO-8859-15\n" -+"Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -+"X-Generator: Lokalize 1.0\n" -+"Plural-Forms: nplurals=2; plural=(n != 1);\n" - - msgid "Recording info" - msgstr "Tallenteen tiedot" -@@ -28,9 +31,9 @@ - msgid "Channels" - msgstr "Kanavat" - --#, fuzzy - msgid "TimerConflicts" --msgstr "Ajastimet" -+msgstr "Päällekkäiset ajastimet" - - msgid "Channel" - msgstr "Kanava" -+ diff --git a/vdr-skins-izegrey16-i18n.patch b/vdr-skins-izegrey16-i18n.patch deleted file mode 100644 index 456e49b..0000000 --- a/vdr-skins-izegrey16-i18n.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- izegrey16/izegrey16.trans~ 2005-03-04 20:41:46.000000000 +0200 -+++ izegrey16/izegrey16.trans 2005-10-22 20:38:54.000000000 +0300 -@@ -1,2 +1,5 @@ - Item=Translation,eng=Volume,deu=Lautstärke,fin=Äänenvoimakkuus; - Item=Translation,eng=/,deu=/,fin=/; -+Item=Translation,eng={ReplayPosition} / {ReplayDuration},deu={ReplayPosition} / {ReplayDuration},fin={ReplayPosition} / {ReplayDuration}; -+Item=Translation,eng={PresentStartDateTime:%d.%m. %H\:%M} - {PresentEndDateTime:%H\:%M},deu={PresentStartDateTime:%d.%m. %H\:%M} - {PresentEndDateTime:%H\:%M},fin={PresentStartDateTime:%d.%m. %H\:%M} - {PresentEndDateTime:%H\:%M}; -+Item=Translation,eng=VPS: {PresentVPSDateTime:%H\:%M},deu=VPS: {PresentVPSDateTime:%H\:%M},fin=VPS: {PresentVPSDateTime:%H\:%M}; diff --git a/vdr-skins-prepare-tarballs.sh b/vdr-skins-prepare-tarballs.sh deleted file mode 100644 index d519376..0000000 --- a/vdr-skins-prepare-tarballs.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh - -set -e - -[ ! -e 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}} -tar c izegrey16 | xz --best > izegrey16-1.0-20050304-nologos.tar.xz -rm -rf izegrey16 - -[ ! -e 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 ] && \ -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 {} ';' -mv Enigma/icons Enigma/icons-normal -tar zx -C Enigma -f $PWD/icons-low-low-col.tar.gz -rm -rf Enigma/{hqlogos/*,fonts/ttf-bitstream-vera*,patches} -tar c Enigma | xz --best > vdrskin-enigma-0.3a-nologos.tar.xz -rm -rf Enigma - -[ ! -e DeepBlue-0.1.4.tar.gz ] && \ -curl -O http://vdr.pfroen.de/download/DeepBlue-0.1.4.tar.gz -[ ! -e 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 -find DeepBlueDXR3 -type d -exec chmod +x {} ';' -rm -rf DeepBlue/logos/* -mv DeepBlueDXR3/HISTORY DeepBlue -mv DeepBlueDXR3/images DeepBlue/images-dxr3 -tar c DeepBlue | xz --best > DeepBlue-0.1.4-nologos.tar.xz -rm -rf DeepBlue DeepBlueDXR3 - -[ ! -e 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/* -tar c Aluminium | xz --best > Aluminium-1.0-demo-nologos.tar.xz -rm -rf Aluminium - -[ ! -e Skin-EgalsTry-1.1.0.tgz ] && \ -curl -O http://www.egal-vdr.de/skins/Skin-EgalsTry-1.1.0.tgz -rm -rf EgalsTry -tar zxf Skin-EgalsTry-1.1.0.tgz -rm -r EgalsTry/logos/* -tar c EgalsTry | xz --best > Skin-EgalsTry-1.1.0-nologos.tar.xz -rm -rf EgalsTry diff --git a/vdr-skins.spec b/vdr-skins.spec deleted file mode 100644 index f824065..0000000 --- a/vdr-skins.spec +++ /dev/null @@ -1,320 +0,0 @@ -# TODO: -# - http://linux.kompiliert.net/contrib/DeepBlue.skin-recordinginfo.diff -# - where has DeepBlue gone? -# - manage symlinks with alternatives? - -Name: vdr-skins -Version: 20111105 -Release: 6%{?dist} -Summary: Collection of OSD skins for VDR - -License: GPL+ - -# Non-linked tarballs prepared with source99 - -# http://home.arcor.de/bjoern.sturzrehm/vdr/ -Source0: http://home.arcor.de/bjoern.sturzrehm/vdr/SilverGreen-0.1.7.tar.bz2 -# http://skins.vdr-developer.org/ -Source1: izegrey16-1.0-20050304-nologos.tar.xz -# http://home.pages.at/brougs78/ -# http://ventoso.org/luca/vdr/ -Source2: vdrskin-enigma-0.3a-nologos.tar.xz -# http://vdr.pfroen.de/ -# http://www.netholic.com/viewtopic.php?t=1464 -Source3: DeepBlue-0.1.4-nologos.tar.xz -# http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/ -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.xz -# http://linux.kompiliert.net/contrib/ -Source6: http://linux.kompiliert.net/contrib/EgalSimple-1.0-demo.tar.bz2 -# http://www.egal-vdr.de/skins/ -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://anthra.justlinux.de/common/overview.html -Source10: http://justlinux.de/vdr/anthra_SD/anthra_SD-0.2.9a.tgz -Source99: %{name}-prepare-tarballs.sh - -Patch0: %{name}-aluminium-i18n.patch -Patch1: %{name}-egalsimple-i18n.patch -Patch2: %{name}-izegrey16-i18n.patch -Patch3: http://toms-cafe.de/vdr/download/deepblue-0.1.4-locale.diff -Patch4: http://toms-cafe.de/vdr/download/enigma-0.3a-locale.diff -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 - -BuildArch: noarch -BuildRequires: vdr-devel >= 1.7.30 -BuildRequires: gettext -BuildRequires: hardlink -Requires: vdr-text2skin >= 1.3 -Requires: vdr >= 1.7.30 -# vdrsymbol-fonts for anthra_SD and Enigma, and "Sans Serif" in others -Requires: vdrsymbol-fonts - -%description -This package contains a collection of skins for VDR's on-screen display. - - -%prep -%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 -sed -i -e 's/\r//g' SilverGreen/{HISTORY,README,SilverGreen.trans} -for f in DeepBlue/HISTORY enElchi/HISTORY Enigma/TODO \ - SilverGreen/{HISTORY,README*}; do - iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f -done -%patch0 -%patch1 -%patch2 -cd DeepBlue -%patch3 -p2 -cd .. -cd Enigma -%patch4 -p2 -%patch7 -p1 -cd .. -cd enElchi -%patch5 -p2 -cd .. -cd izegrey16 -%patch6 -p0 -cd .. -%patch8 -p0 -%patch9 -p0 - -SKINS=$(find * -maxdepth 0 -type d) - -mv DeepBlue/COPYING . -for s in $SKINS ; do - for f in COPYING HISTORY README README.DE TODO ; do - [ -f $s/$f ] && mv $s/$f $f.$s - done -done - -find . -type f -name "*.theme" -exec mv {} . ';' -mv SilverGreen-Default.theme SilverGreen-default.theme -rm SilverGreen-ThemeName.theme -for s in $SKINS ; do - [ -f $s-default.theme ] || touch $s-default.theme -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 -cd .. - -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 -mv icons icons-dxr3 -ln -s icons-normal icons -cd .. - -rm -rf enElchi/themes - -# *.trans not needed with text2skin >= 1.2 and vdr >= 1.6.0 -find . -name "*.trans" -delete - - -%build -for skin in anthra_SD DeepBlue EgalT2 enElchi Enigma ; do - make -C $skin %{?_smp_mflags} HDSKIN=0 -done - - -%install -rm -rf $RPM_BUILD_ROOT - -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%{vdr_vardir}/themes -name "*.theme" -size 0 \ - -printf "%%%%ghost %%p\n" >> %{name}.themes -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_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 -done -%find_lang %{name} --all-name -# Note: .lang before .themes due to defattr in .themes -cat %{name}.lang %{name}.themes > %{name}.files - -# Save a bit of space -%{_sbindir}/hardlink -cv $RPM_BUILD_ROOT%{_datadir} - - -%pre -# For overwriting a symlink with a dir in 20111105-3... -dir=%{vdr_resdir}/text2skin/DeepBlue/logos -[ $1 -gt 1 ] && [ -L $dir ] && rm -rf $(readlink -f $dir) $dir || : - -%triggerin -- vdr-dxr3 -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_resdir}/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 -%doc COPYING* HISTORY.* README.* - -%{vdr_resdir}/text2skin/Aluminium/ - -%{vdr_resdir}/text2skin/anthra_SD/ - -%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_resdir}/text2skin/EgalSimple/ - -%{vdr_resdir}/text2skin/EgalsTry/ - -%{vdr_resdir}/text2skin/EgalT2/ - -%{vdr_resdir}/text2skin/enElchi/ - -%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_resdir}/text2skin/izegrey16/ - -%{vdr_resdir}/text2skin/SilverGreen/ - - -%changelog -* Fri Feb 15 2013 Fedora Release Engineering - 20111105-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Sep 13 2012 Ville Skyttä - 20111105-5 -- Adapt to VDR 1.7.30. - -* Tue Jul 17 2012 Ville Skyttä - 20111105-4 -- Make sure %%pre scriptlet exits with zero status (#840943). - -* Sun Jun 17 2012 Ville Skyttä - 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 - 20111105-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sat Nov 5 2011 Ville Skyttä - 20111105-1 -- Update anthra_SD to 0.2.9a. - -* Fri Nov 4 2011 Ville Skyttä - 20111104-1 -- Update anthra_SD to 0.2.9. -- Specfile cleanups. - -* Mon Feb 21 2011 Ville Skyttä - 20110221-1 -- Update anthra_SD to 0.2.6; vdrsymbol-fonts is now required. -- Patch Enigma to use vdrsymbol-fonts. -- Drop dependency on dejavu-sans-*fonts. - -* Mon Feb 07 2011 Fedora Release Engineering - 20101024-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sun Oct 24 2010 Ville Skyttä - 20101024-1 -- Update anthra_SD to 0.2.4. - -* Wed Oct 20 2010 Ville Skyttä - 20101020-1 -- Add anthra_SD 0.2.3 and EgalT2 0.3.3+Finnish patch. - -* Tue Sep 1 2009 Ville Skyttä - 20090901-1 -- Adapt to recent 1.2+ text2skin versions; patch Aluminium, enigma and izegrey - font handling (no longer filename based font paths, phew). -- Add EgalsTry 1.1.0. -- Apply Thomas Günther's locale patches for DeepBlue, enElchi, and Enigma. -- Drop unused SilverGreen themes, install default properly. -- Recompress cleaned up tarballs with xz. -- Hardlink identical files. - -* Sun Jul 26 2009 Fedora Release Engineering - 20081124-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Fri Feb 27 2009 Ville Skyttä - 20081124-5 -- More deja vu with dejavu-fonts changes (#480477). -- Use %%global instead of %%define. - -* Wed Feb 25 2009 Fedora Release Engineering - 20081124-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Jan 10 2009 Ville Skyttä - 20081124-3 -- Use full DejaVu fonts instead of LGC (#477478). - -* Thu Dec 25 2008 Ville Skyttä - 20081124-2 -- Use DejaVu fonts for Aluminium and Enigma (#477478). - -* Mon Nov 24 2008 Ville Skyttä - 20081124-1 -- Update enElchi to 0.7.2. -- Catch up again with latest dejavu-fonts changes. - -* Mon Apr 7 2008 Ville Skyttä - 20061119-6 -- Don't install translations if built for VDR 1.6.0 due to text2skin issues. -- Re-add disttag. - -* Mon Dec 10 2007 Ville Skyttä - 20061119-5 -- Adjust font paths for dejavu-lgc-fonts 2.22+ (#388891). Deja vu, indeed. - -* Sun Nov 18 2007 Ville Skyttä - 20061119-4 -- Adjust font paths for dejavu-lgc-fonts 2.21+ (#388891). - -* Fri Aug 10 2007 Ville Skyttä - 20061119-3 -- Use DejaVu LGC fonts instead of Bitstream Vera. -- License: GPL+ - -* Mon Apr 23 2007 Ville Skyttä - 20061119-2 -- Relocate themes to /var/lib/vdr/themes, drop disttag (#216355). -- Drop file based dependency on /usr/share/vdr/text2skin. -- Fix sttng-blue source URL. - -* Sun Nov 19 2006 Ville Skyttä - 20061119-1 -- Install skins to /usr/share/vdr/text2skin. -- Don't ship channel logos. - -* Sun Sep 24 2006 Ville Skyttä - 20060924-1 -- Add DXR3 compatible image set for DeepBlue from cccache. - -* Sun May 21 2006 Ville Skyttä - 20060311-2 -- Fix some enElchi logos.