rpms/vdr-skins/FC-6 sttng-blue.theme, NONE, 1.1 vdr-skins-aluminium-i18n.patch, NONE, 1.1 vdr-skins-egalsimple-i18n.patch, NONE, 1.1 vdr-skins-izegrey16-i18n.patch, NONE, 1.1 vdr-skins-prepare-tarballs.sh, NONE, 1.1 vdr-skins.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Ville Skytta (scop) fedora-extras-commits at redhat.com
Tue May 1 19:10:23 UTC 2007


Author: scop

Update of /cvs/extras/rpms/vdr-skins/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20938/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	sttng-blue.theme vdr-skins-aluminium-i18n.patch 
	vdr-skins-egalsimple-i18n.patch vdr-skins-izegrey16-i18n.patch 
	vdr-skins-prepare-tarballs.sh vdr-skins.spec 
Log Message:
Sync with devel


--- NEW FILE sttng-blue.theme ---
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

vdr-skins-aluminium-i18n.patch:

--- NEW FILE vdr-skins-aluminium-i18n.patch ---
--- 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=->;

vdr-skins-egalsimple-i18n.patch:

--- NEW FILE vdr-skins-egalsimple-i18n.patch ---
--- 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};

vdr-skins-izegrey16-i18n.patch:

--- NEW FILE vdr-skins-izegrey16-i18n.patch ---
--- 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};


--- NEW FILE vdr-skins-prepare-tarballs.sh ---
#!/bin/sh

set -e

[ ! -e izegrey16-1.0-20050304.tar.gz ] && \
wget -q 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 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
[ ! -e icons-low-low-col.tar.gz ] && \
wget -q 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 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
[ ! -e DeepBlueDXR3.tar.bz2 ] && \
wget -q 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 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
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
rm -rf Aluminium


--- NEW FILE vdr-skins.spec ---
# TODO:
# - http://linux.kompiliert.net/contrib/DeepBlue.skin-recordinginfo.diff
# - 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)

Name:           vdr-skins
Version:        20061119
Release:        2
Summary:        Collection of OSD skins for VDR

Group:          Applications/Multimedia
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.bz2
# http://home.pages.at/brougs78/
# http://ventoso.org/luca/vdr/
Source2:        vdrskin-enigma-0.3a-nologos.tar.bz2
# http://vdr.pfroen.de/
# 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
# http://www.fdm-ware.de/vdrskin/
# http://linux.kompiliert.net/contrib/
Source5:        Aluminium-1.0-demo-nologos.tar.bz2
# http://linux.kompiliert.net/contrib/
Source6:        http://linux.kompiliert.net/contrib/EgalSimple-1.0-demo.tar.bz2
# 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

Patch0:         %{name}-aluminium-i18n.patch
Patch1:         %{name}-egalsimple-i18n.patch
Patch2:         %{name}-izegrey16-i18n.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  vdr-devel
Requires:       vdr-text2skin >= 1.1
Requires:       vdr >= 1.4.6-2
Requires:       bitstream-vera-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
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

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 {} . ';'
for s in $SKINS ; do
    [ -f $s-default.theme ] || touch $s-default.theme
done

ln -sf mp3.png Aluminium/replay/mp3oss.png
rm Aluminium/{Aluminium.skin.*,MERKEN}

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}

cd Enigma
rm -r themes
ln -sf %{_datadir}/fonts/bitstream-vera/VeraMono.ttf FontMonoSpaced.ttf
find . -type f -iname thumbs.db | xargs rm
mv icons icons-dxr3
ln -s icons-normal icons
cd ..

rm -rf enElchi/themes

sed -i -e \
    's|Vera\(Bd\)\?\.ttf|%{_datadir}/fonts/bitstream-vera/Vera\1.ttf|' \
    izegrey16/izegrey16.skin


%build


%install
rm -rf $RPM_BUILD_ROOT

install -dm 755 $RPM_BUILD_ROOT%{vardir}/themes
install -pm 644 *.theme %{SOURCE8} $RPM_BUILD_ROOT%{vardir}/themes/
echo "%%defattr(-,%{vdr_user},%{vdr_group},-)" > %{name}.themes
find $RPM_BUILD_ROOT%{vardir}/themes -name "*.theme" -size 0 \
    -printf "%%%%ghost %%p\n" >> %{name}.themes
find $RPM_BUILD_ROOT%{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/


%clean
rm -rf $RPM_BUILD_ROOT


%triggerin -- vdr-dxr3
for l in DeepBlue/{images,logos} enElchi/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 || :
done

%triggerun -- vdr-dxr3
if [ $2 -eq 0 ] ; then
    for l in DeepBlue/{images,logos} enElchi/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 || :
    done
fi


%files -f %{name}.themes
%defattr(-,root,root,-)
%doc COPYING* HISTORY.* README.*

%{datadir}/text2skin/Aluminium/

%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

%{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/

%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
%{datadir}/text2skin/Enigma/pics/
%{datadir}/text2skin/Enigma/symbols/

%{datadir}/text2skin/izegrey16/

%{datadir}/text2skin/SilverGreen/


%changelog
* Mon Apr 23 2007 Ville Skyttä <ville.skytta at iki.fi> - 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ä <ville.skytta at iki.fi> - 20061119-1
- Install skins to /usr/share/vdr/text2skin.
- Don't ship channel logos.

* Sun Sep 24 2006 Ville Skyttä <ville.skytta at iki.fi> - 20060924-1
- Add DXR3 compatible image set for DeepBlue from cccache.

* Sun May 21 2006 Ville Skyttä <ville.skytta at iki.fi> - 20060311-2
- Fix some enElchi logos.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vdr-skins/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2007 16:59:04 -0000	1.1
+++ .cvsignore	1 May 2007 19:09:53 -0000	1.2
@@ -0,0 +1,7 @@
+Aluminium-1.0-demo-nologos.tar.bz2
+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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vdr-skins/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2007 16:59:04 -0000	1.1
+++ sources	1 May 2007 19:09:53 -0000	1.2
@@ -0,0 +1,7 @@
+f7aca33ccc3f17f257a6919d1f2d5bc0  Aluminium-1.0-demo-nologos.tar.bz2
+8527b1fc6f7a5bacd622ee828de3f203  DeepBlue-0.1.4-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




More information about the fedora-extras-commits mailing list