From 67b90bdc806bdc406fdc863250ee5fa4e9bb40ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sun, 6 Jan 2008 18:34:02 +0000
Subject: [PATCH 01/30] - Fix build with gcc 4.3's cleaned up C++ headers.

---
 vdr-text2skin-1.1cvs-includes.patch | 30 +++++++++++++++++++++++++++++
 vdr-text2skin.spec                  |  7 ++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 vdr-text2skin-1.1cvs-includes.patch

diff --git a/vdr-text2skin-1.1cvs-includes.patch b/vdr-text2skin-1.1cvs-includes.patch
new file mode 100644
index 0000000..b8881bb
--- /dev/null
+++ b/vdr-text2skin-1.1cvs-includes.patch
@@ -0,0 +1,30 @@
+Index: cache.h
+===================================================================
+RCS file: /var/cvsroot/text2skin/cache.h,v
+retrieving revision 1.7
+diff -u -r1.7 cache.h
+--- cache.h	31 Jan 2005 14:40:29 -0000	1.7
++++ cache.h	3 Jan 2008 23:07:01 -0000
+@@ -5,6 +5,7 @@
+ #ifndef VDR_TEXT2SKIN_CACHE_HPP
+ #define VDR_TEXT2SKIN_CACHE_HPP
+ 
++#include <cstdlib>
+ #include <map>
+ #include <vector>
+ #include <string>
+Index: xml/type.h
+===================================================================
+RCS file: /var/cvsroot/text2skin/xml/type.h,v
+retrieving revision 1.7
+diff -u -r1.7 type.h
+--- xml/type.h	31 Jan 2005 14:39:23 -0000	1.7
++++ xml/type.h	3 Jan 2008 23:07:02 -0000
+@@ -5,6 +5,7 @@
+ #ifndef VDR_TEXT2SKIN_XML_TYPE_H
+ #define VDR_TEXT2SKIN_XML_TYPE_H
+ 
++#include <cstdlib>
+ #include <string>
+ #include <vdr/tools.h>
+ #include <stdio.h>
diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index 292e035..f156500 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -8,7 +8,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.1
-Release:        20.%{cvs}cvs%{?dist}
+Release:        21.%{cvs}cvs%{?dist}
 Summary:        OSD skin plugin for VDR
 
 Group:          Applications/Multimedia
@@ -20,6 +20,7 @@ Source1:        %{name}.conf
 Patch0:         %{name}-1.1cvs-cvsfixes.patch
 Patch1:         %{name}-1.1cvs-freetype22.patch
 Patch2:         %{name}-1.1cvs-skindir.patch
+Patch3:         %{name}-1.1cvs-includes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?_with_imagemagick:1}
@@ -50,6 +51,7 @@ cd text2skin
 %patch0 -p0
 %patch1 -p0
 sed -e 's|/usr/share/vdr/|%{datadir}/|' %{PATCH2} | patch -p1
+%patch3 -p0
 find . -depth -type d -name CVS | xargs rm -r
 for f in HISTORY README.de Docs/*.txt ; do
     iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
@@ -104,6 +106,9 @@ fi
 
 
 %changelog
+* Fri Jan  4 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1-21.20051217cvs
+- Fix build with gcc 4.3's cleaned up C++ headers.
+
 * Wed Aug 22 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1-20.20051217cvs
 - BuildRequires: gawk for extracting APIVERSION.
 

From c4ccb133a39c39e93ec56ad58625b60c42d5ac65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sun, 6 Apr 2008 18:22:41 +0000
Subject: [PATCH 02/30] - Apply VDR 1.5+ patches from e-tobi.net Debian
 package.

---
 vdr-text2skin-1.1cvs-vdr154.patch |  73 +++++++++++++++++++++
 vdr-text2skin-1.1cvs-vdr157.patch | 101 ++++++++++++++++++++++++++++++
 vdr-text2skin.spec                |  21 ++++++-
 3 files changed, 193 insertions(+), 2 deletions(-)
 create mode 100644 vdr-text2skin-1.1cvs-vdr154.patch
 create mode 100644 vdr-text2skin-1.1cvs-vdr157.patch

diff --git a/vdr-text2skin-1.1cvs-vdr154.patch b/vdr-text2skin-1.1cvs-vdr154.patch
new file mode 100644
index 0000000..7501aa3
--- /dev/null
+++ b/vdr-text2skin-1.1cvs-vdr154.patch
@@ -0,0 +1,73 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 94_text2skin-1.1-cvs_ext-0.10-vdr-1.5.4.dpatch by Stone <syphyr@gmail.com>
+##
+## Thomas Günther <tom@toms-cafe.de>
+##   - Added compatibility to VDR < 1.5.4
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.4.
+
+@DPATCH@
+--- text2skin/graphtft/font.c
++++ text2skin/graphtft/font.c
+@@ -41,6 +41,7 @@
+ 	if ( _cache.find(CacheName) != _cache.end() )
+ 		return true;	
+ 	
++#if VDRVERSNUM < 10503
+ 	int error = FT_New_Face(_library, Filename.c_str(), format, &_face);
+ 
+ 	// every thing ok?
+@@ -187,6 +188,17 @@
+ 	delete(font_data);
+ 	// Something went wrong!
+ 	return false;
++#else
++#if VDRVERSNUM < 10504
++	cFont* newFont = new cFreetypeFont(*AddDirectory(FONTDIR, Filename.c_str()), Size);
++#else
++	cFont* newFont = cFont::CreateFont(Filename.c_str(), Size);
++#endif
++	if ( newFont == NULL )
++		return false;
++	_cache[CacheName] = newFont;
++	return true;
++#endif
+ }
+ 
+ const cFont* cGraphtftFont::GetFont(string CacheName){
+@@ -210,10 +222,12 @@
+ 		delete((*it).second);
+ 	_cache.clear();
+ 
++#if VDRVERSNUM < 10503
+ 	del_map::iterator del_it = _del.begin();
+ 	for (; del_it != _del.end(); ++del_it)
+ 		delete((*del_it).second);
+ 	_del.clear();
++#endif
+ }
+ 				
+ cGraphtftFont GraphtftFont;
+--- text2skin/graphtft/font.h
++++ text2skin/graphtft/font.h
+@@ -24,7 +24,9 @@
+ {
+ private:
+ 	typedef map<string,cFont*> cache_map;
++#if VDRVERSNUM < 10503
+ 	typedef map<string,cFont::tPixelData*> del_map;
++#endif
+ 	
+ public:
+ 	cGraphtftFont();
+@@ -40,7 +42,9 @@
+ 	FT_Face			_face;
+ 	FT_GlyphSlot		_slot;
+ 	cache_map 		_cache;
++#if VDRVERSNUM < 10503
+ 	del_map			_del;
++#endif
+ 
+ };
+ 
diff --git a/vdr-text2skin-1.1cvs-vdr157.patch b/vdr-text2skin-1.1cvs-vdr157.patch
new file mode 100644
index 0000000..665f84c
--- /dev/null
+++ b/vdr-text2skin-1.1cvs-vdr157.patch
@@ -0,0 +1,101 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 95_text2skin-1.1-cvs_ext-0.10-20070620.3-vdr-1.5.7-1.dpatch by Stone <syphyr@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.7.
+
+@DPATCH@
+--- text2skin-1.1-cvs_ext-0.10-20070620.3/font.c.orig	2007-08-13 08:54:41.000000000 -0700
++++ text2skin-1.1-cvs_ext-0.10-20070620.3/font.c	2007-08-13 09:17:43.000000000 -0700
+@@ -31,8 +31,13 @@
+ 	const cFont *res = NULL;
+ #ifdef HAVE_FREETYPE
+ 	char *cachename;
++#if VDRVERSNUM >= 10507
++	asprintf(&cachename, "%s_%d_%d_%d", Filename.c_str(), Size, Width, I18nCurrentLanguage());
++	if (mFontCache.Load(Path + "/" + Filename, cachename, Size, I18nCurrentLanguage(), Width))
++#else
+ 	asprintf(&cachename, "%s_%d_%d_%d", Filename.c_str(), Size, Width, Setup.OSDLanguage);
+ 	if (mFontCache.Load(Path + "/" + Filename, cachename, Size, Setup.OSDLanguage, Width))
++#endif
+ 		res = mFontCache.GetFont(cachename);
+ 	else
+ 		esyslog("ERROR: Text2Skin: Couldn't load font %s:%d", Filename.c_str(), Size);
+--- text2skin-1.1-cvs_ext-0.10-20070620.3/i18n.c.orig	2007-08-13 07:34:10.000000000 -0700
++++ text2skin-1.1-cvs_ext-0.10-20070620.3/i18n.c	2007-08-13 08:53:31.000000000 -0700
+@@ -491,7 +491,11 @@
+ 
+ cText2SkinI18n::~cText2SkinI18n() {
+ 	for (int i = 0; mPhrases[i][0]; ++i) {
++#if VDRVERSNUM >= 10507
++		for (int j = 0; j < I18nLanguages()->Size(); ++j)
++#else
+ 		for (int j = 0; j < I18nNumLanguages; ++j)
++#endif
+ 			free((void*)mPhrases[i][j]);
+ 	}
+ 	free(mPhrases);
+@@ -507,7 +511,11 @@
+ 			memset(&p, 0, sizeof(tI18nPhrase));
+ 			Text += 17;
+ 
++#if VDRVERSNUM >= 10507
++			for (i = 0; i < I18nLanguages()->Size(); ++i) {
++#else
+ 			for (i = 0; i < I18nNumLanguages; ++i) {
++#endif
+ 				char *langs = strdup(I18nLanguageCode(i));
+ 				char *ptr = langs, *ep;
+ 				std::string text;
+@@ -525,7 +533,11 @@
+ 			}
+ 
+ 			int idx = mNumPhrases++;
++#if VDRVERSNUM >= 10507
++			for (i = 0; i < I18nLanguages()->Size(); ++i)
++#else
+ 			for (i = 0; i < I18nNumLanguages; ++i)
++#endif
+ 				if (!p[i]) p[i] = "";
+ 			mPhrases = (tI18nPhrase*)realloc(mPhrases, (mNumPhrases + 1) * sizeof(tI18nPhrase));
+ 			memcpy(mPhrases[idx], p, sizeof(tI18nPhrase));
+@@ -539,7 +551,9 @@
+ 
+ bool cText2SkinI18n::Load(const std::string &Filename) {
+ 	if (cText2SkinFile::Load(Filename)) {
++#if VDRVERSNUM <= 10506
+ 		I18nRegister(mPhrases, mIdentity.c_str());
++#endif
+ 		return true;
+ 	}
+ 	return false;
+--- text2skin-1.1-cvs_ext-0.10-20070620.3/status.c.orig	2007-08-13 09:54:04.000000000 -0700
++++ text2skin-1.1-cvs_ext-0.10-20070620.3/status.c	2007-08-13 09:57:10.000000000 -0700
+@@ -130,8 +130,13 @@
+ 
+ void cText2SkinStatus::OsdClear(void) 
+ {
++#if VDRVERSNUM >= 10507
++	if (I18nCurrentLanguage() != mLastLanguage) {
++		mLastLanguage = I18nCurrentLanguage();
++#else
+ 	if (Setup.OSDLanguage != mLastLanguage) {
+ 		mLastLanguage = Setup.OSDLanguage;
++#endif
+ 		cxString::Reparse();
+ 	}
+ 	
+--- text2skin-1.1-cvs_ext-0.10-20070620.3/text2skin.c.orig	2007-08-13 09:46:25.000000000 -0700
++++ text2skin-1.1-cvs_ext-0.10-20070620.3/text2skin.c	2007-08-13 10:30:11.000000000 -0700
+@@ -49,7 +49,11 @@
+ 
+ bool cText2SkinPlugin::Start(void) {
+ 	RegisterI18n(Phrases);
++#if VDRVERSNUM >= 10507
++	Text2SkinStatus.SetLanguage(I18nCurrentLanguage());
++#else
+ 	Text2SkinStatus.SetLanguage(Setup.OSDLanguage);
++#endif
+ 	cText2SkinLoader::Start();
+ 	return true;
+ }
diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index f156500..f60bce4 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -8,7 +8,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.1
-Release:        21.%{cvs}cvs%{?dist}
+Release:        22.%{cvs}cvs%{?dist}
 Summary:        OSD skin plugin for VDR
 
 Group:          Applications/Multimedia
@@ -21,6 +21,8 @@ Patch0:         %{name}-1.1cvs-cvsfixes.patch
 Patch1:         %{name}-1.1cvs-freetype22.patch
 Patch2:         %{name}-1.1cvs-skindir.patch
 Patch3:         %{name}-1.1cvs-includes.patch
+Patch4:         %{name}-1.1cvs-vdr154.patch
+Patch5:         %{name}-1.1cvs-vdr157.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?_with_imagemagick:1}
@@ -47,19 +49,28 @@ of the skin wishes.
 
 %prep
 %setup -q -c
+
 cd text2skin
+
 %patch0 -p0
 %patch1 -p0
 sed -e 's|/usr/share/vdr/|%{datadir}/|' %{PATCH2} | patch -p1
 %patch3 -p0
+%patch4 -p1
+%patch5 -p1
+
 find . -depth -type d -name CVS | xargs rm -r
+
 for f in HISTORY README.de Docs/*.txt ; do
     iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 done
+
 chmod -x contrib/*.pl
+
 sed -i -e /strip/d -e /O2/d Makefile
 sed -i -e '/^DVBDIR/d' -e 's|-I$(DVBDIR)\(/linux\)\?/include||g' Makefile
 sed -i -e s/VDRVERSION/APIVERSION/g Makefile
+
 cd ..
 
 
@@ -73,12 +84,15 @@ make -C text2skin %{?_smp_mflags} $opts LIBDIR=. VDRDIR=%{_libdir}/vdr all
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 cd text2skin
 install -dm 755 $RPM_BUILD_ROOT%{plugindir}
 install -pm 755 libvdr-%{pname}.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
+cd ..
+
 install -Dpm 644 %{SOURCE1} \
     $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
-cd ..
+
 install -dm 755 $RPM_BUILD_ROOT%{datadir}/text2skin/fonts
 
 
@@ -106,6 +120,9 @@ fi
 
 
 %changelog
+* Sun Apr  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1-22.20051217cvs
+- Apply VDR 1.5+ patches from e-tobi.net Debian package.
+
 * Fri Jan  4 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1-21.20051217cvs
 - Fix build with gcc 4.3's cleaned up C++ headers.
 

From f8a7889279d9bc169cb603a3fb1d77b1a150a749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Mon, 7 Apr 2008 20:56:44 +0000
Subject: [PATCH 03/30] - Update to 1.1-cvs_ext-0.10. - Build for VDR 1.6.0.

---
 .cvsignore                            |  2 +-
 sources                               |  2 +-
 vdr-text2skin-1.1cvs-cvsfixes.patch   | 57 ---------------------------
 vdr-text2skin-1.1cvs-freetype22.patch | 35 ----------------
 vdr-text2skin.spec                    | 24 +++++------
 5 files changed, 14 insertions(+), 106 deletions(-)
 delete mode 100644 vdr-text2skin-1.1cvs-cvsfixes.patch
 delete mode 100644 vdr-text2skin-1.1cvs-freetype22.patch

diff --git a/.cvsignore b/.cvsignore
index d04e53e..d059a0b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-vdr-text2skin-1.1cvs-20051217.tgz
+vdr-text2skin-1.1-cvs_ext-0.10.tgz
diff --git a/sources b/sources
index d543fcb..56b72dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f59bba08b3ded6c6a044e715e1669e0d  vdr-text2skin-1.1cvs-20051217.tgz
+92d5e0612f59f16190db93ae817f08ae  vdr-text2skin-1.1-cvs_ext-0.10.tgz
diff --git a/vdr-text2skin-1.1cvs-cvsfixes.patch b/vdr-text2skin-1.1cvs-cvsfixes.patch
deleted file mode 100644
index d5c087c..0000000
--- a/vdr-text2skin-1.1cvs-cvsfixes.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- status.c	3 Jun 2005 08:53:13 -0000	1.10
-+++ status.c	17 Mar 2006 18:25:57 -0000	1.11
-@@ -29,14 +29,16 @@
- 	mNextRecording    = 0;
- }
- 
--void cText2SkinStatus::Replaying(const cControl* /*Control*/, const char *Name) {
-+void cText2SkinStatus::Replaying(const cControl* /*Control*/, const char *Name,
-+								 const char *FileName, bool On) 
-+{
- 	Dprintf("cText2SkinStatus::Replaying(%s)\n", Name);
- 	eReplayMode oldMode = mReplayMode;
- 
- 	if (mRender != NULL)
- 		mRender->UpdateLock();
- 
--	if (Name != NULL) {
-+	if (On) {
- 		mReplayMode = replayMPlayer;
- 		if (strlen(Name) > 6 && Name[0]=='[' && Name[3]==']' && Name[5]=='(') {
- 			int i;
-@@ -83,7 +85,8 @@
- 	}
- }
- 
--void cText2SkinStatus::Recording(const cDevice *Device, const char *Name) 
-+void cText2SkinStatus::Recording(const cDevice *Device, const char *Name,
-+								 const char *FileName, bool On) 
- {
- 	if (mRender != NULL)
- 		mRender->UpdateLock();
---- status.h	3 Jun 2005 08:53:13 -0000	1.7
-+++ status.h	17 Mar 2006 18:25:57 -0000	1.8
-@@ -39,8 +39,10 @@
- 	int               mLastLanguage;
- 
- protected:
--	virtual void Replaying(const cControl *Control, const char *Name);
--	virtual void Recording(const cDevice *Device, const char *Name);
-+	virtual void Replaying(const cControl *Control, const char *Name, 
-+						   const char *FileName, bool On);
-+	virtual void Recording(const cDevice *Device, const char *Name, 
-+						   const char *FileName, bool On);
- 	virtual void OsdClear(void);
- 
- public:
---- xml/xml.c	19 Dec 2004 22:03:49 -0000	1.1.1.1
-+++ xml/xml.c	4 Sep 2006 20:51:06 -0000	1.3
-@@ -38,7 +38,7 @@
- 	buffer = new char [size];
- 	f.read(buffer, size);
- 	f.close();
--	data = buffer;
-+	data.assign(buffer, size);
- 	delete[] buffer;
- 	nodestartcb  = NULL;
- 	nodeendcb    = NULL;
diff --git a/vdr-text2skin-1.1cvs-freetype22.patch b/vdr-text2skin-1.1cvs-freetype22.patch
deleted file mode 100644
index 04547c8..0000000
--- a/vdr-text2skin-1.1cvs-freetype22.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: graphtft/font.c
-===================================================================
-RCS file: /var/cvsroot/text2skin/graphtft/font.c,v
-retrieving revision 1.4
-diff -u -r1.4 font.c
---- graphtft/font.c	30 Jan 2005 18:09:42 -0000	1.4
-+++ graphtft/font.c	19 Nov 2006 15:04:06 -0000
-@@ -139,20 +139,21 @@
- 		 error = FT_Load_Glyph( _face, glyph_index, FT_LOAD_DEFAULT ); 
- 		 if ( error ) continue; /* ignore errors */  
- 		 
--		 // convert to a mono bitmap
--		 error = FT_Render_Glyph( _face->glyph, ft_render_mode_mono ); 
--		 if ( error ) continue;
--		
- 		// now, convert to vdr font data
- 		int width = (_slot->metrics.horiAdvance / 64) + 1;
- 		int bearingX = (_slot->metrics.horiBearingX / 64) +1;
- 		width = (width > (int)sizeof(cFont::tPixelData) * 8) ? (((int)sizeof(cFont::tPixelData) * 8)-2) :width ;
--		int  top = _slot->bitmap_top;
--		int  y_off = Size - top;
- 
- 		font_data[(num_char_array*num_rows)+0]=width;
- 		font_data[(num_char_array*num_rows)+1]=num_rows_global;
- 
-+		// convert to a mono bitmap
-+		error = FT_Render_Glyph( _face->glyph, ft_render_mode_mono );
-+		if ( error ) continue;
-+
-+		int  top = _slot->bitmap_top;
-+		int  y_off = Size - top;
-+
- 		unsigned char *bmp = _slot->bitmap.buffer;
- 		
-       		for (int y = 0; y < _slot->bitmap.rows; ++y , y_off++) {
diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index f60bce4..7734f5d 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -4,25 +4,24 @@
 %define datadir   %(vdr-config --datadir    2>/dev/null || echo ERROR)
 %define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
 
-%define cvs 20051217
+%define ext     0.10
 
 Name:           vdr-%{pname}
 Version:        1.1
-Release:        22.%{cvs}cvs%{?dist}
+Release:        23.cvsext%{ext}%{?dist}
 Summary:        OSD skin plugin for VDR
 
 Group:          Applications/Multimedia
 License:        GPL+
 URL:            http://linux.kompiliert.net/index.php?view=text2skin
 #Source0:        http://linux.kompiliert.net/files/%{name}-%{version}.tgz
-Source0:        http://linux.kompiliert.net/contrib/%{name}-%{version}cvs-%{cvs}.tgz
+#Source0:        http://linux.kompiliert.net/contrib/%{name}-%{version}cvs-%{cvs}.tgz
+Source0:        http://brougs78.vdr-developer.org/tmp/vdr-text2skin-%{version}-cvs_ext-%{ext}.tgz
 Source1:        %{name}.conf
-Patch0:         %{name}-1.1cvs-cvsfixes.patch
-Patch1:         %{name}-1.1cvs-freetype22.patch
+Patch0:         %{name}-1.1cvs-vdr154.patch
+Patch1:         %{name}-1.1cvs-vdr157.patch
 Patch2:         %{name}-1.1cvs-skindir.patch
 Patch3:         %{name}-1.1cvs-includes.patch
-Patch4:         %{name}-1.1cvs-vdr154.patch
-Patch5:         %{name}-1.1cvs-vdr157.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?_with_imagemagick:1}
@@ -52,12 +51,10 @@ of the skin wishes.
 
 cd text2skin
 
-%patch0 -p0
-%patch1 -p0
+%patch0 -p1
+%patch1 -p1
 sed -e 's|/usr/share/vdr/|%{datadir}/|' %{PATCH2} | patch -p1
 %patch3 -p0
-%patch4 -p1
-%patch5 -p1
 
 find . -depth -type d -name CVS | xargs rm -r
 
@@ -69,7 +66,6 @@ chmod -x contrib/*.pl
 
 sed -i -e /strip/d -e /O2/d Makefile
 sed -i -e '/^DVBDIR/d' -e 's|-I$(DVBDIR)\(/linux\)\?/include||g' Makefile
-sed -i -e s/VDRVERSION/APIVERSION/g Makefile
 
 cd ..
 
@@ -120,6 +116,10 @@ fi
 
 
 %changelog
+* Mon Apr  7 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1-23.cvsext0.10
+- Update to 1.1-cvs_ext-0.10.
+- Build for VDR 1.6.0.
+
 * Sun Apr  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1-22.20051217cvs
 - Apply VDR 1.5+ patches from e-tobi.net Debian package.
 

From 7ea638688d8eadb190162522eb27407c1372d3a7 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Thu, 26 Feb 2009 00:01:27 +0000
Subject: [PATCH 04/30] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

---
 vdr-text2skin.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index 7734f5d..0ef0f61 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -8,7 +8,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.1
-Release:        23.cvsext%{ext}%{?dist}
+Release:        24.cvsext%{ext}%{?dist}
 Summary:        OSD skin plugin for VDR
 
 Group:          Applications/Multimedia
@@ -116,6 +116,9 @@ fi
 
 
 %changelog
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-24.cvsext0.10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Mon Apr  7 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1-23.cvsext0.10
 - Update to 1.1-cvs_ext-0.10.
 - Build for VDR 1.6.0.

From 7c8d71f1de534a65d6cffeefc5461bb7429559b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Wed, 8 Jul 2009 21:42:56 +0000
Subject: [PATCH 05/30] - Update to 1.2. - Specfile cleanups. - Fix spelling
 errors in description.

---
 .cvsignore                                    |   2 +-
 sources                                       |   2 +-
 vdr-text2skin-1.1cvs-includes.patch           |  30 ------
 vdr-text2skin-1.1cvs-vdr154.patch             |  73 -------------
 vdr-text2skin-1.1cvs-vdr157.patch             | 101 ------------------
 ...r.patch => vdr-text2skin-1.2-skindir.patch |  53 ++++-----
 vdr-text2skin.spec                            |  72 ++++---------
 7 files changed, 49 insertions(+), 284 deletions(-)
 delete mode 100644 vdr-text2skin-1.1cvs-includes.patch
 delete mode 100644 vdr-text2skin-1.1cvs-vdr154.patch
 delete mode 100644 vdr-text2skin-1.1cvs-vdr157.patch
 rename vdr-text2skin-1.1cvs-skindir.patch => vdr-text2skin-1.2-skindir.patch (58%)

diff --git a/.cvsignore b/.cvsignore
index d059a0b..ae18d3b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-vdr-text2skin-1.1-cvs_ext-0.10.tgz
+vdr-text2skin-1.2.tgz
diff --git a/sources b/sources
index 56b72dc..d69d932 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-92d5e0612f59f16190db93ae817f08ae  vdr-text2skin-1.1-cvs_ext-0.10.tgz
+bc24ba8fad94ac435081144b067676db  vdr-text2skin-1.2.tgz
diff --git a/vdr-text2skin-1.1cvs-includes.patch b/vdr-text2skin-1.1cvs-includes.patch
deleted file mode 100644
index b8881bb..0000000
--- a/vdr-text2skin-1.1cvs-includes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: cache.h
-===================================================================
-RCS file: /var/cvsroot/text2skin/cache.h,v
-retrieving revision 1.7
-diff -u -r1.7 cache.h
---- cache.h	31 Jan 2005 14:40:29 -0000	1.7
-+++ cache.h	3 Jan 2008 23:07:01 -0000
-@@ -5,6 +5,7 @@
- #ifndef VDR_TEXT2SKIN_CACHE_HPP
- #define VDR_TEXT2SKIN_CACHE_HPP
- 
-+#include <cstdlib>
- #include <map>
- #include <vector>
- #include <string>
-Index: xml/type.h
-===================================================================
-RCS file: /var/cvsroot/text2skin/xml/type.h,v
-retrieving revision 1.7
-diff -u -r1.7 type.h
---- xml/type.h	31 Jan 2005 14:39:23 -0000	1.7
-+++ xml/type.h	3 Jan 2008 23:07:02 -0000
-@@ -5,6 +5,7 @@
- #ifndef VDR_TEXT2SKIN_XML_TYPE_H
- #define VDR_TEXT2SKIN_XML_TYPE_H
- 
-+#include <cstdlib>
- #include <string>
- #include <vdr/tools.h>
- #include <stdio.h>
diff --git a/vdr-text2skin-1.1cvs-vdr154.patch b/vdr-text2skin-1.1cvs-vdr154.patch
deleted file mode 100644
index 7501aa3..0000000
--- a/vdr-text2skin-1.1cvs-vdr154.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 94_text2skin-1.1-cvs_ext-0.10-vdr-1.5.4.dpatch by Stone <syphyr@gmail.com>
-##
-## Thomas Günther <tom@toms-cafe.de>
-##   - Added compatibility to VDR < 1.5.4
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes for VDR >= 1.5.4.
-
-@DPATCH@
---- text2skin/graphtft/font.c
-+++ text2skin/graphtft/font.c
-@@ -41,6 +41,7 @@
- 	if ( _cache.find(CacheName) != _cache.end() )
- 		return true;	
- 	
-+#if VDRVERSNUM < 10503
- 	int error = FT_New_Face(_library, Filename.c_str(), format, &_face);
- 
- 	// every thing ok?
-@@ -187,6 +188,17 @@
- 	delete(font_data);
- 	// Something went wrong!
- 	return false;
-+#else
-+#if VDRVERSNUM < 10504
-+	cFont* newFont = new cFreetypeFont(*AddDirectory(FONTDIR, Filename.c_str()), Size);
-+#else
-+	cFont* newFont = cFont::CreateFont(Filename.c_str(), Size);
-+#endif
-+	if ( newFont == NULL )
-+		return false;
-+	_cache[CacheName] = newFont;
-+	return true;
-+#endif
- }
- 
- const cFont* cGraphtftFont::GetFont(string CacheName){
-@@ -210,10 +222,12 @@
- 		delete((*it).second);
- 	_cache.clear();
- 
-+#if VDRVERSNUM < 10503
- 	del_map::iterator del_it = _del.begin();
- 	for (; del_it != _del.end(); ++del_it)
- 		delete((*del_it).second);
- 	_del.clear();
-+#endif
- }
- 				
- cGraphtftFont GraphtftFont;
---- text2skin/graphtft/font.h
-+++ text2skin/graphtft/font.h
-@@ -24,7 +24,9 @@
- {
- private:
- 	typedef map<string,cFont*> cache_map;
-+#if VDRVERSNUM < 10503
- 	typedef map<string,cFont::tPixelData*> del_map;
-+#endif
- 	
- public:
- 	cGraphtftFont();
-@@ -40,7 +42,9 @@
- 	FT_Face			_face;
- 	FT_GlyphSlot		_slot;
- 	cache_map 		_cache;
-+#if VDRVERSNUM < 10503
- 	del_map			_del;
-+#endif
- 
- };
- 
diff --git a/vdr-text2skin-1.1cvs-vdr157.patch b/vdr-text2skin-1.1cvs-vdr157.patch
deleted file mode 100644
index 665f84c..0000000
--- a/vdr-text2skin-1.1cvs-vdr157.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 95_text2skin-1.1-cvs_ext-0.10-20070620.3-vdr-1.5.7-1.dpatch by Stone <syphyr@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes for VDR >= 1.5.7.
-
-@DPATCH@
---- text2skin-1.1-cvs_ext-0.10-20070620.3/font.c.orig	2007-08-13 08:54:41.000000000 -0700
-+++ text2skin-1.1-cvs_ext-0.10-20070620.3/font.c	2007-08-13 09:17:43.000000000 -0700
-@@ -31,8 +31,13 @@
- 	const cFont *res = NULL;
- #ifdef HAVE_FREETYPE
- 	char *cachename;
-+#if VDRVERSNUM >= 10507
-+	asprintf(&cachename, "%s_%d_%d_%d", Filename.c_str(), Size, Width, I18nCurrentLanguage());
-+	if (mFontCache.Load(Path + "/" + Filename, cachename, Size, I18nCurrentLanguage(), Width))
-+#else
- 	asprintf(&cachename, "%s_%d_%d_%d", Filename.c_str(), Size, Width, Setup.OSDLanguage);
- 	if (mFontCache.Load(Path + "/" + Filename, cachename, Size, Setup.OSDLanguage, Width))
-+#endif
- 		res = mFontCache.GetFont(cachename);
- 	else
- 		esyslog("ERROR: Text2Skin: Couldn't load font %s:%d", Filename.c_str(), Size);
---- text2skin-1.1-cvs_ext-0.10-20070620.3/i18n.c.orig	2007-08-13 07:34:10.000000000 -0700
-+++ text2skin-1.1-cvs_ext-0.10-20070620.3/i18n.c	2007-08-13 08:53:31.000000000 -0700
-@@ -491,7 +491,11 @@
- 
- cText2SkinI18n::~cText2SkinI18n() {
- 	for (int i = 0; mPhrases[i][0]; ++i) {
-+#if VDRVERSNUM >= 10507
-+		for (int j = 0; j < I18nLanguages()->Size(); ++j)
-+#else
- 		for (int j = 0; j < I18nNumLanguages; ++j)
-+#endif
- 			free((void*)mPhrases[i][j]);
- 	}
- 	free(mPhrases);
-@@ -507,7 +511,11 @@
- 			memset(&p, 0, sizeof(tI18nPhrase));
- 			Text += 17;
- 
-+#if VDRVERSNUM >= 10507
-+			for (i = 0; i < I18nLanguages()->Size(); ++i) {
-+#else
- 			for (i = 0; i < I18nNumLanguages; ++i) {
-+#endif
- 				char *langs = strdup(I18nLanguageCode(i));
- 				char *ptr = langs, *ep;
- 				std::string text;
-@@ -525,7 +533,11 @@
- 			}
- 
- 			int idx = mNumPhrases++;
-+#if VDRVERSNUM >= 10507
-+			for (i = 0; i < I18nLanguages()->Size(); ++i)
-+#else
- 			for (i = 0; i < I18nNumLanguages; ++i)
-+#endif
- 				if (!p[i]) p[i] = "";
- 			mPhrases = (tI18nPhrase*)realloc(mPhrases, (mNumPhrases + 1) * sizeof(tI18nPhrase));
- 			memcpy(mPhrases[idx], p, sizeof(tI18nPhrase));
-@@ -539,7 +551,9 @@
- 
- bool cText2SkinI18n::Load(const std::string &Filename) {
- 	if (cText2SkinFile::Load(Filename)) {
-+#if VDRVERSNUM <= 10506
- 		I18nRegister(mPhrases, mIdentity.c_str());
-+#endif
- 		return true;
- 	}
- 	return false;
---- text2skin-1.1-cvs_ext-0.10-20070620.3/status.c.orig	2007-08-13 09:54:04.000000000 -0700
-+++ text2skin-1.1-cvs_ext-0.10-20070620.3/status.c	2007-08-13 09:57:10.000000000 -0700
-@@ -130,8 +130,13 @@
- 
- void cText2SkinStatus::OsdClear(void) 
- {
-+#if VDRVERSNUM >= 10507
-+	if (I18nCurrentLanguage() != mLastLanguage) {
-+		mLastLanguage = I18nCurrentLanguage();
-+#else
- 	if (Setup.OSDLanguage != mLastLanguage) {
- 		mLastLanguage = Setup.OSDLanguage;
-+#endif
- 		cxString::Reparse();
- 	}
- 	
---- text2skin-1.1-cvs_ext-0.10-20070620.3/text2skin.c.orig	2007-08-13 09:46:25.000000000 -0700
-+++ text2skin-1.1-cvs_ext-0.10-20070620.3/text2skin.c	2007-08-13 10:30:11.000000000 -0700
-@@ -49,7 +49,11 @@
- 
- bool cText2SkinPlugin::Start(void) {
- 	RegisterI18n(Phrases);
-+#if VDRVERSNUM >= 10507
-+	Text2SkinStatus.SetLanguage(I18nCurrentLanguage());
-+#else
- 	Text2SkinStatus.SetLanguage(Setup.OSDLanguage);
-+#endif
- 	cText2SkinLoader::Start();
- 	return true;
- }
diff --git a/vdr-text2skin-1.1cvs-skindir.patch b/vdr-text2skin-1.2-skindir.patch
similarity index 58%
rename from vdr-text2skin-1.1cvs-skindir.patch
rename to vdr-text2skin-1.2-skindir.patch
index 28cbc35..835119c 100644
--- a/vdr-text2skin-1.1cvs-skindir.patch
+++ b/vdr-text2skin-1.2-skindir.patch
@@ -1,18 +1,19 @@
---- text2skin-1.1-cvs/README.de~	2004-12-20 00:03:08.000000000 +0200
-+++ text2skin-1.1-cvs/README.de	2006-11-19 18:42:54.000000000 +0200
-@@ -77,6 +77,9 @@
- Wo die Skins hingehören:
- ------------------------
+diff -up text2skin-1.2/common.c~ text2skin-1.2/common.c
+--- text2skin-1.2/common.c~	2009-06-15 21:21:50.000000000 +0300
++++ text2skin-1.2/common.c	2009-06-15 21:58:22.000000000 +0300
+@@ -14,7 +14,7 @@
+ const std::string &SkinPath(void) 
+ {
+ 	// should never change
+-	static std::string path = cPlugin::ConfigDirectory(PLUGIN_NAME_I18N);
++	static std::string path = "/usr/share/vdr/text2skin";
+ 	return path;
+ }
  
-+*** rpm package note: this text2skin package has been patched to load skins
-+*** from /usr/share/vdr/text2skin instead of the path documented below.
-+
- Wie Sie vielleicht wissen, hat VDR einen Unterordner "plugins" innerhalb seines
- Konfigurationsordners, in dem alle Dateien, die zu Plugins gehören, enthalten
- sein sollten. Wenn Sie nicht wissen, wo das sein könnte, schauen Sie in dem
---- text2skin-1.1-cvs/README~	2005-01-31 16:39:45.000000000 +0200
-+++ text2skin-1.1-cvs/README	2006-11-19 18:42:36.000000000 +0200
-@@ -82,6 +82,9 @@
+diff -up text2skin-1.2/README~ text2skin-1.2/README
+--- text2skin-1.2/README~	2009-06-15 21:21:50.000000000 +0300
++++ text2skin-1.2/README	2009-06-15 21:58:20.000000000 +0300
+@@ -82,6 +82,9 @@ vdr-1.3.17-osdbase-maxitems.diff
  Where to put the skins:
  -----------------------
  
@@ -22,7 +23,7 @@
  As you might know, VDR has a subfolder "plugins" inside it's configuration 
  folder, where all plugin-related files should reside. If you don't know, where
  this could be, look into the folder you gave to VDR with the -v parameter 
-@@ -109,6 +112,9 @@
+@@ -109,6 +112,9 @@ it there.
  Where to put the fonts:
  -----------------------
  
@@ -32,14 +33,16 @@
  Font files (.ttf) can be placed either in the directory of the skin itself or 
  in a subfolder fonts inside the text2skin directory.
  
---- text2skin-1.1-cvs/common.c~	2005-01-07 23:46:51.000000000 +0200
-+++ text2skin-1.1-cvs/common.c	2006-11-19 18:38:31.000000000 +0200
-@@ -8,7 +8,7 @@
- const std::string &SkinPath(void) 
- {
- 	// should never change
--	static std::string path = cPlugin::ConfigDirectory(PLUGIN_NAME_I18N);
-+	static std::string path = "/usr/share/vdr/text2skin";
- 	return path;
- }
+diff -up text2skin-1.2/README.de~ text2skin-1.2/README.de
+--- text2skin-1.2/README.de~	2009-06-15 21:21:50.000000000 +0300
++++ text2skin-1.2/README.de	2009-06-15 21:58:27.000000000 +0300
+@@ -77,6 +77,9 @@ root@linux # ./vdr -P text2skin
+ Wo die Skins hingehören:
+ ------------------------
  
++*** rpm package note: this text2skin package has been patched to load skins
++*** from /usr/share/vdr/text2skin instead of the path documented below.
++
+ Wie Sie vielleicht wissen, hat VDR einen Unterordner "plugins" innerhalb seines
+ Konfigurationsordners, in dem alle Dateien, die zu Plugins gehören, enthalten
+ sein sollten. Wenn Sie nicht wissen, wo das sein könnte, schauen Sie in dem
diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index 0ef0f61..ca28f83 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -1,27 +1,19 @@
 %define pname     text2skin
 %define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
-%define configdir %(vdr-config --configdir  2>/dev/null || echo ERROR)
 %define datadir   %(vdr-config --datadir    2>/dev/null || echo ERROR)
 %define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
 
-%define ext     0.10
-
 Name:           vdr-%{pname}
-Version:        1.1
-Release:        24.cvsext%{ext}%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        OSD skin plugin for VDR
 
 Group:          Applications/Multimedia
 License:        GPL+
-URL:            http://linux.kompiliert.net/index.php?view=text2skin
-#Source0:        http://linux.kompiliert.net/files/%{name}-%{version}.tgz
-#Source0:        http://linux.kompiliert.net/contrib/%{name}-%{version}cvs-%{cvs}.tgz
-Source0:        http://brougs78.vdr-developer.org/tmp/vdr-text2skin-%{version}-cvs_ext-%{ext}.tgz
+URL:            http://projects.vdr-developer.org/projects/show/plg-text2skin
+Source0:        http://projects.vdr-developer.org/attachments/download/112/%{name}-%{version}.tgz
 Source1:        %{name}.conf
-Patch0:         %{name}-1.1cvs-vdr154.patch
-Patch1:         %{name}-1.1cvs-vdr157.patch
-Patch2:         %{name}-1.1cvs-skindir.patch
-Patch3:         %{name}-1.1cvs-includes.patch
+Patch0:         %{name}-1.2-skindir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?_with_imagemagick:1}
@@ -34,57 +26,36 @@ BuildRequires:  vdr-devel >= 1.3.47
 BuildRequires:  sed >= 3.95
 BuildRequires:  which
 BuildRequires:  gawk
+BuildRequires:  gettext
 Requires:       vdr(abi) = %{apiver}
 
 %description
 This plugin is designed to load and interpret a set of files
 describing the layout of VDR's on screen display and to make this
 "skin" available to VDR via Setup -> OSD in the main menu.  Of course
-it is possible to load more than one text-based skin this way and to
+it is possible to load more than one text based skin this way and to
 choose between them while running VDR.  All skins may be themeable
-(you can create your own color-theme) and translateable as the author
+(you can create your own color theme) and translatable as the author
 of the skin wishes.
 
 
 %prep
-%setup -q -c
-
-cd text2skin
-
-%patch0 -p1
-%patch1 -p1
-sed -e 's|/usr/share/vdr/|%{datadir}/|' %{PATCH2} | patch -p1
-%patch3 -p0
-
-find . -depth -type d -name CVS | xargs rm -r
-
-for f in HISTORY README.de Docs/*.txt ; do
-    iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-done
-
+%setup -q -n %{pname}-%{version}
+sed -e 's|/usr/share/vdr/|%{datadir}/|' %{PATCH0} | patch -p1
 chmod -x contrib/*.pl
-
 sed -i -e /strip/d -e /O2/d Makefile
-sed -i -e '/^DVBDIR/d' -e 's|-I$(DVBDIR)\(/linux\)\?/include||g' Makefile
-
-cd ..
 
 
 %build
-opts=
-%if 0%{!?_with_imagemagick:1}
-opts="HAVE_IMLIB2=1 HAVE_IMAGEMAGICK="
-%endif
-make -C text2skin %{?_smp_mflags} $opts LIBDIR=. VDRDIR=%{_libdir}/vdr all
+opts="%{!?_with_imagemagick:HAVE_IMLIB2=1 HAVE_IMAGEMAGICK=}"
+make %{?_smp_mflags} $opts LIBDIR=. LOCALEDIR=./locale VDRDIR=%{_libdir}/vdr all
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-cd text2skin
 install -dm 755 $RPM_BUILD_ROOT%{plugindir}
 install -pm 755 libvdr-%{pname}.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
-cd ..
 
 install -Dpm 644 %{SOURCE1} \
     $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
@@ -96,26 +67,21 @@ install -dm 755 $RPM_BUILD_ROOT%{datadir}/text2skin/fonts
 rm -rf $RPM_BUILD_ROOT
 
 
-%pre
-if [ $1 -gt 1 -a -d %{configdir}/plugins/text2skin ] ; then
-    # Migrate skins (can't overwrite a dir with a symlink)
-    mkdir -p %{datadir}/text2skin && \
-    cp -a %{configdir}/plugins/text2skin/* %{datadir}/text2skin || :
-    rm -rf %{configdir}/plugins/text2skin
-fi
-
-
 %files
 %defattr(-,root,root,-)
-%doc text2skin/CONTRIBUTORS text2skin/COPYING text2skin/HISTORY
-%doc text2skin/README text2skin/Docs/*.txt text2skin/contrib/skin_to_10.pl
-%lang(de) %doc text2skin/README.de
+%doc CONTRIBUTORS COPYING HISTORY README Docs/*.txt contrib/skin_to_10.pl
+%lang(de) %doc README.de
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
 %{plugindir}/libvdr-%{pname}.so.%{apiver}
 %{datadir}/text2skin/
 
 
 %changelog
+* Thu Jul  9 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.2-1
+- Update to 1.2.
+- Specfile cleanups.
+- Fix spelling errors in description.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-24.cvsext0.10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 

From 56a7c16fa730945a61a680e1266e32fe3c865546 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Mon, 27 Jul 2009 06:47:45 +0000
Subject: [PATCH 06/30] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

---
 vdr-text2skin.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index ca28f83..8f64c74 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -5,7 +5,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OSD skin plugin for VDR
 
 Group:          Applications/Multimedia
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Jul  9 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.2-1
 - Update to 1.2.
 - Specfile cleanups.

From 900aad748f6793ed91d2681ac19df1d23dff6373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Tue, 1 Sep 2009 20:23:41 +0000
Subject: [PATCH 07/30] - Update to git revision 97c95bc for several bugfixes
 and better fonts     handling. - Build with GraphicsMagick instead of imlib2
 by default. - Make vdr(abi) dependency ISA qualified. - Install translations.
 - Use %global instead of %define.

---
 .cvsignore                                    |  2 +-
 sources                                       |  2 +-
 ...r.patch => vdr-text2skin-1.3-skindir.patch | 50 +++++++---------
 vdr-text2skin.spec                            | 57 ++++++++++++-------
 4 files changed, 59 insertions(+), 52 deletions(-)
 rename vdr-text2skin-1.2-skindir.patch => vdr-text2skin-1.3-skindir.patch (52%)

diff --git a/.cvsignore b/.cvsignore
index ae18d3b..7432a6d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-vdr-text2skin-1.2.tgz
+vdr-plugin-text2skin-97c95bc.tar.gz
diff --git a/sources b/sources
index d69d932..cf97d4c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bc24ba8fad94ac435081144b067676db  vdr-text2skin-1.2.tgz
+4f2c86e5a12283ef7bb159ae29794d61  vdr-plugin-text2skin-97c95bc.tar.gz
diff --git a/vdr-text2skin-1.2-skindir.patch b/vdr-text2skin-1.3-skindir.patch
similarity index 52%
rename from vdr-text2skin-1.2-skindir.patch
rename to vdr-text2skin-1.3-skindir.patch
index 835119c..d04c7fb 100644
--- a/vdr-text2skin-1.2-skindir.patch
+++ b/vdr-text2skin-1.3-skindir.patch
@@ -1,6 +1,6 @@
-diff -up text2skin-1.2/common.c~ text2skin-1.2/common.c
---- text2skin-1.2/common.c~	2009-06-15 21:21:50.000000000 +0300
-+++ text2skin-1.2/common.c	2009-06-15 21:58:22.000000000 +0300
+diff -up vdr-plugin-text2skin/common.c.orig vdr-plugin-text2skin/common.c
+--- vdr-plugin-text2skin/common.c.orig	2009-08-22 01:11:50.000000000 +0300
++++ vdr-plugin-text2skin/common.c	2009-09-01 22:31:23.000000000 +0300
 @@ -14,7 +14,7 @@
  const std::string &SkinPath(void) 
  {
@@ -10,33 +10,10 @@ diff -up text2skin-1.2/common.c~ text2skin-1.2/common.c
  	return path;
  }
  
-diff -up text2skin-1.2/README~ text2skin-1.2/README
---- text2skin-1.2/README~	2009-06-15 21:21:50.000000000 +0300
-+++ text2skin-1.2/README	2009-06-15 21:58:20.000000000 +0300
-@@ -82,6 +82,9 @@ vdr-1.3.17-osdbase-maxitems.diff
- Where to put the skins:
- -----------------------
- 
-+*** rpm package note: this text2skin package has been patched to load skins
-+*** from /usr/share/vdr/text2skin instead of the path documented below.
-+
- As you might know, VDR has a subfolder "plugins" inside it's configuration 
- folder, where all plugin-related files should reside. If you don't know, where
- this could be, look into the folder you gave to VDR with the -v parameter 
-@@ -109,6 +112,9 @@ it there.
- Where to put the fonts:
- -----------------------
- 
-+*** rpm package note: this text2skin package has been patched to load fonts
-+*** from /usr/share/vdr/text2skin instead of the path documented below.
-+
- Font files (.ttf) can be placed either in the directory of the skin itself or 
- in a subfolder fonts inside the text2skin directory.
- 
-diff -up text2skin-1.2/README.de~ text2skin-1.2/README.de
---- text2skin-1.2/README.de~	2009-06-15 21:21:50.000000000 +0300
-+++ text2skin-1.2/README.de	2009-06-15 21:58:27.000000000 +0300
-@@ -77,6 +77,9 @@ root@linux # ./vdr -P text2skin
+diff -up vdr-plugin-text2skin/README.de.orig vdr-plugin-text2skin/README.de
+--- vdr-plugin-text2skin/README.de.orig	2009-08-22 01:11:50.000000000 +0300
++++ vdr-plugin-text2skin/README.de	2009-09-01 22:31:23.000000000 +0300
+@@ -70,6 +70,9 @@ root@linux # ./vdr -P text2skin
  Wo die Skins hingehören:
  ------------------------
  
@@ -46,3 +23,16 @@ diff -up text2skin-1.2/README.de~ text2skin-1.2/README.de
  Wie Sie vielleicht wissen, hat VDR einen Unterordner "plugins" innerhalb seines
  Konfigurationsordners, in dem alle Dateien, die zu Plugins gehören, enthalten
  sein sollten. Wenn Sie nicht wissen, wo das sein könnte, schauen Sie in dem
+diff -up vdr-plugin-text2skin/README.orig vdr-plugin-text2skin/README
+--- vdr-plugin-text2skin/README.orig	2009-08-22 01:11:50.000000000 +0300
++++ vdr-plugin-text2skin/README	2009-09-01 22:31:23.000000000 +0300
+@@ -68,6 +68,9 @@ root@linux # ./vdr -P text2skin
+ Where to put the skins:
+ -----------------------
+ 
++*** rpm package note: this text2skin package has been patched to load skins
++*** from /usr/share/vdr/text2skin instead of the path documented below.
++
+ As you might know, VDR has a subfolder "plugins" inside it's configuration 
+ folder, where all plugin-related files should reside. If you don't know, where
+ this could be, look into the folder you gave to VDR with the -v parameter 
diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index 8f64c74..9b8510b 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -1,33 +1,40 @@
-%define pname     text2skin
-%define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
-%define datadir   %(vdr-config --datadir    2>/dev/null || echo ERROR)
-%define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
+%global pname     text2skin
+%global gitrev    97c95bc
+%global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
+%global datadir   %(vdr-config --datadir    2>/dev/null || echo ERROR)
+%global apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
+# imagelib: imagemagick, graphicsmagick, imlib2 or %{nil}
+%{!?imagelib: %global imagelib graphicsmagick}
 
 Name:           vdr-%{pname}
 Version:        1.2
-Release:        2%{?dist}
+Release:        3.git%{gitrev}%{?dist}
 Summary:        OSD skin plugin for VDR
 
 Group:          Applications/Multimedia
 License:        GPL+
 URL:            http://projects.vdr-developer.org/projects/show/plg-text2skin
-Source0:        http://projects.vdr-developer.org/attachments/download/112/%{name}-%{version}.tgz
+# wget --content-disposition "http://projects.vdr-developer.org/git/?p=vdr-plugin-text2skin.git;a=snapshot;h=%{gitrev};sf=tgz"
+Source0:        vdr-plugin-%{pname}-%{gitrev}.tar.gz
 Source1:        %{name}.conf
-Patch0:         %{name}-1.2-skindir.patch
+Patch0:         %{name}-1.3-skindir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if 0%{?_with_imagemagick:1}
+%if "%{imagelib}" == "imagemagick"
 BuildRequires:  ImageMagick-c++-devel
-%else
+%endif
+%if "%{imagelib}" == "graphicsmagick"
+BuildRequires:  GraphicsMagick-c++-devel
+# Dependency missing in GraphicsMagick-devel <= 1.1.14-4.fc11
+BuildRequires:  freetype-devel
+%endif
+%if "%{imagelib}" == "imlib2"
 BuildRequires:  imlib2-devel
 %endif
-BuildRequires:  freetype-devel
-BuildRequires:  vdr-devel >= 1.3.47
-BuildRequires:  sed >= 3.95
-BuildRequires:  which
+BuildRequires:  vdr-devel >= 1.6.0
 BuildRequires:  gawk
 BuildRequires:  gettext
-Requires:       vdr(abi) = %{apiver}
+Requires:       vdr(abi)%{?_isa} = %{apiver}
 
 %description
 This plugin is designed to load and interpret a set of files
@@ -40,15 +47,14 @@ of the skin wishes.
 
 
 %prep
-%setup -q -n %{pname}-%{version}
+%setup -q -n vdr-plugin-%{pname}
 sed -e 's|/usr/share/vdr/|%{datadir}/|' %{PATCH0} | patch -p1
 chmod -x contrib/*.pl
-sed -i -e /strip/d -e /O2/d Makefile
 
 
 %build
-opts="%{!?_with_imagemagick:HAVE_IMLIB2=1 HAVE_IMAGEMAGICK=}"
-make %{?_smp_mflags} $opts LIBDIR=. LOCALEDIR=./locale VDRDIR=%{_libdir}/vdr all
+make %{?_smp_mflags} STRIP=: IMAGELIB=%{?imagelib} LIBDIR=. LOCALEDIR=./locale \
+    VDRDIR=%{_libdir}/vdr all
 
 
 %install
@@ -60,14 +66,18 @@ install -pm 755 libvdr-%{pname}.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
 install -Dpm 644 %{SOURCE1} \
     $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
 
-install -dm 755 $RPM_BUILD_ROOT%{datadir}/text2skin/fonts
+install -dm 755 $RPM_BUILD_ROOT%{datadir}/text2skin
+
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale
+cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
+%find_lang %{name}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS COPYING HISTORY README Docs/*.txt contrib/skin_to_10.pl
 %lang(de) %doc README.de
@@ -77,6 +87,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep  1 2009 Ville Skyttä <ville.skytta@iki.fi> - 1.2-3.git97c95bc
+- Update to git revision 97c95bc for several bugfixes and better fonts handling.
+- Build with GraphicsMagick instead of imlib2 by default.
+- Make vdr(abi) dependency ISA qualified.
+- Install translations.
+- Use %%global instead of %%define.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

From 87b12c6166da01ba6ff1d0cf978988781ff5a7df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Wed, 7 Oct 2009 20:34:27 +0000
Subject: [PATCH 08/30] - Update to 1.3 (#527682). - Filter out autoprovided
 libvdr-*.so.* (if %filter_setup is available).

---
 .cvsignore                      |  2 +-
 sources                         |  2 +-
 vdr-text2skin-1.3-skindir.patch | 38 ++++++++++++++--------------
 vdr-text2skin.spec              | 44 +++++++++++++++++++--------------
 4 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 7432a6d..9b4d134 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-vdr-plugin-text2skin-97c95bc.tar.gz
+vdr-text2skin-1.3.tgz
diff --git a/sources b/sources
index cf97d4c..5b08a7f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4f2c86e5a12283ef7bb159ae29794d61  vdr-plugin-text2skin-97c95bc.tar.gz
+39f3354b5ae04ee41cb45543de858ec2  vdr-text2skin-1.3.tgz
diff --git a/vdr-text2skin-1.3-skindir.patch b/vdr-text2skin-1.3-skindir.patch
index d04c7fb..acdaf5c 100644
--- a/vdr-text2skin-1.3-skindir.patch
+++ b/vdr-text2skin-1.3-skindir.patch
@@ -1,6 +1,6 @@
-diff -up vdr-plugin-text2skin/common.c.orig vdr-plugin-text2skin/common.c
---- vdr-plugin-text2skin/common.c.orig	2009-08-22 01:11:50.000000000 +0300
-+++ vdr-plugin-text2skin/common.c	2009-09-01 22:31:23.000000000 +0300
+diff -up text2skin-1.3/common.c~ text2skin-1.3/common.c
+--- text2skin-1.3/common.c~	2009-07-17 02:18:57.000000000 +0300
++++ text2skin-1.3/common.c	2009-10-07 23:19:34.000000000 +0300
 @@ -14,7 +14,7 @@
  const std::string &SkinPath(void) 
  {
@@ -10,22 +10,9 @@ diff -up vdr-plugin-text2skin/common.c.orig vdr-plugin-text2skin/common.c
  	return path;
  }
  
-diff -up vdr-plugin-text2skin/README.de.orig vdr-plugin-text2skin/README.de
---- vdr-plugin-text2skin/README.de.orig	2009-08-22 01:11:50.000000000 +0300
-+++ vdr-plugin-text2skin/README.de	2009-09-01 22:31:23.000000000 +0300
-@@ -70,6 +70,9 @@ root@linux # ./vdr -P text2skin
- Wo die Skins hingehören:
- ------------------------
- 
-+*** rpm package note: this text2skin package has been patched to load skins
-+*** from /usr/share/vdr/text2skin instead of the path documented below.
-+
- Wie Sie vielleicht wissen, hat VDR einen Unterordner "plugins" innerhalb seines
- Konfigurationsordners, in dem alle Dateien, die zu Plugins gehören, enthalten
- sein sollten. Wenn Sie nicht wissen, wo das sein könnte, schauen Sie in dem
-diff -up vdr-plugin-text2skin/README.orig vdr-plugin-text2skin/README
---- vdr-plugin-text2skin/README.orig	2009-08-22 01:11:50.000000000 +0300
-+++ vdr-plugin-text2skin/README	2009-09-01 22:31:23.000000000 +0300
+diff -up text2skin-1.3/README~ text2skin-1.3/README
+--- text2skin-1.3/README~	2009-07-17 02:16:35.000000000 +0300
++++ text2skin-1.3/README	2009-10-07 23:19:34.000000000 +0300
 @@ -68,6 +68,9 @@ root@linux # ./vdr -P text2skin
  Where to put the skins:
  -----------------------
@@ -36,3 +23,16 @@ diff -up vdr-plugin-text2skin/README.orig vdr-plugin-text2skin/README
  As you might know, VDR has a subfolder "plugins" inside it's configuration 
  folder, where all plugin-related files should reside. If you don't know, where
  this could be, look into the folder you gave to VDR with the -v parameter 
+diff -up text2skin-1.3/README.de~ text2skin-1.3/README.de
+--- text2skin-1.3/README.de~	2009-09-06 18:31:27.000000000 +0300
++++ text2skin-1.3/README.de	2009-10-07 23:19:34.000000000 +0300
+@@ -73,6 +73,9 @@ root@linux # ./vdr -P text2skin
+ Wo die Skins hingehören:
+ ------------------------
+ 
++*** rpm package note: this text2skin package has been patched to load skins
++*** from /usr/share/vdr/text2skin instead of the path documented below.
++
+ Wie Sie vielleicht wissen, hat VDR einen Unterordner "plugins" innerhalb seines
+ Konfigurationsordners, in dem alle Dateien, die zu Plugins gehören, enthalten
+ sein sollten. Wenn Sie nicht wissen, wo das sein könnte, schauen Sie in dem
diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index 9b8510b..011b6fe 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -1,5 +1,4 @@
 %global pname     text2skin
-%global gitrev    97c95bc
 %global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
 %global datadir   %(vdr-config --datadir    2>/dev/null || echo ERROR)
 %global apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
@@ -7,15 +6,14 @@
 %{!?imagelib: %global imagelib graphicsmagick}
 
 Name:           vdr-%{pname}
-Version:        1.2
-Release:        3.git%{gitrev}%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 Summary:        OSD skin plugin for VDR
 
 Group:          Applications/Multimedia
 License:        GPL+
 URL:            http://projects.vdr-developer.org/projects/show/plg-text2skin
-# wget --content-disposition "http://projects.vdr-developer.org/git/?p=vdr-plugin-text2skin.git;a=snapshot;h=%{gitrev};sf=tgz"
-Source0:        vdr-plugin-%{pname}-%{gitrev}.tar.gz
+Source0:        http://projects.vdr-developer.org/attachments/download/127/%{name}-%{version}.tgz
 Source1:        %{name}.conf
 Patch0:         %{name}-1.3-skindir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,6 +34,10 @@ BuildRequires:  gawk
 BuildRequires:  gettext
 Requires:       vdr(abi)%{?_isa} = %{apiver}
 
+%{?filter_setup:
+%filter_provides_in %{plugindir}/.*\.so
+%filter_setup}
+
 %description
 This plugin is designed to load and interpret a set of files
 describing the layout of VDR's on screen display and to make this
@@ -47,7 +49,7 @@ of the skin wishes.
 
 
 %prep
-%setup -q -n vdr-plugin-%{pname}
+%setup -q -n %{pname}-%{version}
 sed -e 's|/usr/share/vdr/|%{datadir}/|' %{PATCH0} | patch -p1
 chmod -x contrib/*.pl
 
@@ -87,6 +89,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct  7 2009 Ville Skyttä <ville.skytta@iki.fi> - 1.3-1
+- Update to 1.3 (#527682).
+- Filter out autoprovided libvdr-*.so.* (if %%filter_setup is available).
+
 * Tue Sep  1 2009 Ville Skyttä <ville.skytta@iki.fi> - 1.2-3.git97c95bc
 - Update to git revision 97c95bc for several bugfixes and better fonts handling.
 - Build with GraphicsMagick instead of imlib2 by default.
@@ -97,7 +103,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Thu Jul  9 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.2-1
+* Thu Jul  9 2009 Ville Skyttä <ville.skytta@iki.fi> - 1.2-1
 - Update to 1.2.
 - Specfile cleanups.
 - Fix spelling errors in description.
@@ -105,44 +111,44 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-24.cvsext0.10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Mon Apr  7 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1-23.cvsext0.10
+* Mon Apr  7 2008 Ville Skyttä <ville.skytta@iki.fi> - 1.1-23.cvsext0.10
 - Update to 1.1-cvs_ext-0.10.
 - Build for VDR 1.6.0.
 
-* Sun Apr  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1-22.20051217cvs
+* Sun Apr  6 2008 Ville Skyttä <ville.skytta@iki.fi> - 1.1-22.20051217cvs
 - Apply VDR 1.5+ patches from e-tobi.net Debian package.
 
-* Fri Jan  4 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1-21.20051217cvs
+* Fri Jan  4 2008 Ville Skyttä <ville.skytta@iki.fi> - 1.1-21.20051217cvs
 - Fix build with gcc 4.3's cleaned up C++ headers.
 
-* Wed Aug 22 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1-20.20051217cvs
+* Wed Aug 22 2007 Ville Skyttä <ville.skytta@iki.fi> - 1.1-20.20051217cvs
 - BuildRequires: gawk for extracting APIVERSION.
 
-* Tue Aug  7 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1-19.20051217cvs
+* Tue Aug  7 2007 Ville Skyttä <ville.skytta@iki.fi> - 1.1-19.20051217cvs
 - License: GPL+
 
-* Sun Apr  8 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1-18.20051217cvs
+* Sun Apr  8 2007 Ville Skyttä <ville.skytta@iki.fi> - 1.1-18.20051217cvs
 - Grab potential XML parse buffer overflow fix from upstream CVS.
 
-* Sun Nov 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1-16.20051217cvs
+* Sun Nov 19 2006 Ville Skyttä <ville.skytta@iki.fi> - 1.1-16.20051217cvs
 - Migrate real skins directory to /usr/share/vdr/text2skin.
 - Patch for freetype 2.2 compatibility.
 
-* Sat Nov  4 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1-15.20051217
+* Sat Nov  4 2006 Ville Skyttä <ville.skytta@iki.fi> - 1.1-15.20051217
 - Build with imlib2 instead of imagemagick by default due to #212478.
 - Build for VDR 1.4.4.
 
 * Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.1-14
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
-* Sat Sep 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1-13.20051217
+* Sat Sep 23 2006 Ville Skyttä <ville.skytta@iki.fi> - 1.1-13.20051217
 - Rebuild for VDR 1.4.3.
 
-* Sun Aug  6 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1-12.20051217
+* Sun Aug  6 2006 Ville Skyttä <ville.skytta@iki.fi> - 1.1-12.20051217
 - Rebuild for VDR 1.4.1-3.
 
-* Sun Jun 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1-11.20051217
+* Sun Jun 11 2006 Ville Skyttä <ville.skytta@iki.fi> - 1.1-11.20051217
 - Rebuild for VDR 1.4.1.
 
-* Sun Apr 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1-10.20051217
+* Sun Apr 30 2006 Ville Skyttä <ville.skytta@iki.fi> - 1.1-10.20051217
 - Rebuild for VDR 1.4.0.

From 459eb64c4380faa3f0c8e4a2d6cb0148a124e719 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Wed, 25 Nov 2009 22:43:20 +0000
Subject: [PATCH 09/30] 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 241edc1..d247620 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: vdr-text2skin
-# $Id$
+# $Id: Makefile,v 1.1 2007/04/23 17:04:59 wtogami Exp $
 NAME := vdr-text2skin
 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 a3b4a6190f820f3440525ef75b3cb1d4a525fca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Tue, 22 Jun 2010 15:55:08 +0000
Subject: [PATCH 10/30] - Update to 1.3.1 (#606725).

---
 .cvsignore         |  2 +-
 sources            |  2 +-
 vdr-text2skin.spec | 11 +++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 9b4d134..3d1cff2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-vdr-text2skin-1.3.tgz
+vdr-text2skin-1.3.1.tgz
diff --git a/sources b/sources
index 5b08a7f..d88a52f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-39f3354b5ae04ee41cb45543de858ec2  vdr-text2skin-1.3.tgz
+b0f615b821731f46c36c2894d733b85f  vdr-text2skin-1.3.1.tgz
diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index 011b6fe..d62b411 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -2,18 +2,18 @@
 %global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
 %global datadir   %(vdr-config --datadir    2>/dev/null || echo ERROR)
 %global apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
-# imagelib: imagemagick, graphicsmagick, imlib2 or %{nil}
+# imagelib: imagemagick, graphicsmagick, imlib2 or %%{nil}
 %{!?imagelib: %global imagelib graphicsmagick}
 
 Name:           vdr-%{pname}
-Version:        1.3
+Version:        1.3.1
 Release:        1%{?dist}
 Summary:        OSD skin plugin for VDR
 
 Group:          Applications/Multimedia
 License:        GPL+
 URL:            http://projects.vdr-developer.org/projects/show/plg-text2skin
-Source0:        http://projects.vdr-developer.org/attachments/download/127/%{name}-%{version}.tgz
+Source0:        http://projects.vdr-developer.org/attachments/download/344/%{name}-%{version}.tgz
 Source1:        %{name}.conf
 Patch0:         %{name}-1.3-skindir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,7 +51,7 @@ of the skin wishes.
 %prep
 %setup -q -n %{pname}-%{version}
 sed -e 's|/usr/share/vdr/|%{datadir}/|' %{PATCH0} | patch -p1
-chmod -x contrib/*.pl
+chmod -c -x contrib/*.pl
 
 
 %build
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 22 2010 Ville Skyttä <ville.skytta@iki.fi> - 1.3.1-1
+- Update to 1.3.1 (#606725).
+
 * Wed Oct  7 2009 Ville Skyttä <ville.skytta@iki.fi> - 1.3-1
 - Update to 1.3 (#527682).
 - Filter out autoprovided libvdr-*.so.* (if %%filter_setup is available).

From ed6630066d8933ee7ed52cc2ed86841712ecafaf Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 14:56:20 +0000
Subject: [PATCH 11/30] 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 d247620..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: vdr-text2skin
-# $Id: Makefile,v 1.1 2007/04/23 17:04:59 wtogami Exp $
-NAME := vdr-text2skin
-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 420aed8313d92b81554dc0ff1ad7d73f64d528d4 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Mon, 7 Feb 2011 19:11:25 -0600
Subject: [PATCH 12/30] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

---
 vdr-text2skin.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index d62b411..398b793 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -7,7 +7,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OSD skin plugin for VDR
 
 Group:          Applications/Multimedia
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Tue Jun 22 2010 Ville Skyttä <ville.skytta@iki.fi> - 1.3.1-1
 - Update to 1.3.1 (#606725).
 

From 4e3e8842a099cc3ef8c0b12e14ce99ee70068b6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 31 May 2011 23:17:31 +0300
Subject: [PATCH 13/30] Patch to fix cache initialization crash when built with
 GCC 4.6. Use __provides_exclude_from to filter Provides. Clean up some no
 longer needed specfile cruft.

---
 vdr-text2skin-1.3.1-cache-init.patch | 43 ++++++++++++++++++++++++++++
 vdr-text2skin.spec                   | 18 ++++++------
 2 files changed, 53 insertions(+), 8 deletions(-)
 create mode 100644 vdr-text2skin-1.3.1-cache-init.patch

diff --git a/vdr-text2skin-1.3.1-cache-init.patch b/vdr-text2skin-1.3.1-cache-init.patch
new file mode 100644
index 0000000..5254190
--- /dev/null
+++ b/vdr-text2skin-1.3.1-cache-init.patch
@@ -0,0 +1,43 @@
+commit 99093d5ac8dc4307769c324c2dbaf18849ad8706
+Author: Ville Skyttä <ville.skytta@iki.fi>
+Date:   Sat May 28 14:39:31 2011 +0300
+
+    (Re?)set bitmap cache size when initializing bitmaps.
+    
+    Without something like this, when built with gcc 4.6, the cache's max
+    size ends up set to 0 (it's initialized before setup is done) and we
+    crash in cache[].
+
+diff --git a/bitmap.c b/bitmap.c
+index 5319333..8159536 100644
+--- a/bitmap.c
++++ b/bitmap.c
+@@ -90,6 +90,7 @@ void cText2SkinBitmap::Init(void) {
+ #ifdef HAVE_IMAGEMAGICK
+ 	InitializeMagick(NULL);
+ #endif
++	mCache.SetMaxItems(Text2SkinSetup.MaxCacheFill);
+ }
+ 
+ cText2SkinBitmap::cText2SkinBitmap(void) {
+diff --git a/cache.h b/cache.h
+index b3cc782..f37e693 100644
+--- a/cache.h
++++ b/cache.h
+@@ -31,6 +31,7 @@ public:
+ 	bool Contains(const key_type &Key);
+ 	data_type &operator[](const key_type &Key);
+ 	uint Count(void) { return mUsage.size(); }
++	void SetMaxItems(uint MaxItems) { mMaxItems = MaxItems; }
+ };
+ 
+ template<class key_type, class data_type>
+@@ -85,7 +86,7 @@ data_type &cxCache<key_type, data_type>::operator[](const key_type &Key)
+ 		return it->second;
+ 	} 
+ 
+-	if (mUsage.size() == mMaxItems) {
++	while (mUsage.size() >= mMaxItems) {
+ 		item_iterator it = mItems.find(*mUsage.begin());
+ 		DeleteObject(it->first, it->second);
+ 		mUsage.erase(mUsage.begin());
diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index 398b793..574e0eb 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -2,12 +2,13 @@
 %global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
 %global datadir   %(vdr-config --datadir    2>/dev/null || echo ERROR)
 %global apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
+%global __provides_exclude_from ^%{plugindir}/
 # imagelib: imagemagick, graphicsmagick, imlib2 or %%{nil}
 %{!?imagelib: %global imagelib graphicsmagick}
 
 Name:           vdr-%{pname}
 Version:        1.3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        OSD skin plugin for VDR
 
 Group:          Applications/Multimedia
@@ -16,6 +17,8 @@ URL:            http://projects.vdr-developer.org/projects/show/plg-text2skin
 Source0:        http://projects.vdr-developer.org/attachments/download/344/%{name}-%{version}.tgz
 Source1:        %{name}.conf
 Patch0:         %{name}-1.3-skindir.patch
+# In upstream post-1.3.1 git
+Patch1:         %{name}-1.3.1-cache-init.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%{imagelib}" == "imagemagick"
@@ -23,8 +26,6 @@ BuildRequires:  ImageMagick-c++-devel
 %endif
 %if "%{imagelib}" == "graphicsmagick"
 BuildRequires:  GraphicsMagick-c++-devel
-# Dependency missing in GraphicsMagick-devel <= 1.1.14-4.fc11
-BuildRequires:  freetype-devel
 %endif
 %if "%{imagelib}" == "imlib2"
 BuildRequires:  imlib2-devel
@@ -34,10 +35,6 @@ BuildRequires:  gawk
 BuildRequires:  gettext
 Requires:       vdr(abi)%{?_isa} = %{apiver}
 
-%{?filter_setup:
-%filter_provides_in %{plugindir}/.*\.so
-%filter_setup}
-
 %description
 This plugin is designed to load and interpret a set of files
 describing the layout of VDR's on screen display and to make this
@@ -51,6 +48,7 @@ of the skin wishes.
 %prep
 %setup -q -n %{pname}-%{version}
 sed -e 's|/usr/share/vdr/|%{datadir}/|' %{PATCH0} | patch -p1
+%patch1 -p1
 chmod -c -x contrib/*.pl
 
 
@@ -80,7 +78,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc CONTRIBUTORS COPYING HISTORY README Docs/*.txt contrib/skin_to_10.pl
 %lang(de) %doc README.de
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
@@ -89,6 +86,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue May 31 2011 Ville Skyttä <ville.skytta@iki.fi> - 1.3.1-3
+- Patch to fix cache initialization crash when built with GCC 4.6.
+- Use __provides_exclude_from to filter Provides.
+- Clean up some no longer needed specfile cruft.
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 

From 7f9dbd1ca3cae8aae601ef3f5e82e465b29a9383 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 6 Nov 2011 19:26:12 +0200
Subject: [PATCH 14/30] Update to 1.3.2. Clean up specfile constructs no longer
 needed with Fedora or EL6+.

---
 .gitignore                           |  2 +-
 sources                              |  2 +-
 vdr-text2skin-1.3.1-cache-init.patch | 43 -------------------------
 vdr-text2skin.spec                   | 48 ++++++++++++----------------
 4 files changed, 22 insertions(+), 73 deletions(-)
 delete mode 100644 vdr-text2skin-1.3.1-cache-init.patch

diff --git a/.gitignore b/.gitignore
index 3d1cff2..17d6b36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-vdr-text2skin-1.3.1.tgz
+/*.tgz
diff --git a/sources b/sources
index d88a52f..d20f190 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b0f615b821731f46c36c2894d733b85f  vdr-text2skin-1.3.1.tgz
+e9cdf24d1a4dd1d65d72cbf0f1ff6df5  vdr-text2skin-1.3.2.tgz
diff --git a/vdr-text2skin-1.3.1-cache-init.patch b/vdr-text2skin-1.3.1-cache-init.patch
deleted file mode 100644
index 5254190..0000000
--- a/vdr-text2skin-1.3.1-cache-init.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit 99093d5ac8dc4307769c324c2dbaf18849ad8706
-Author: Ville Skyttä <ville.skytta@iki.fi>
-Date:   Sat May 28 14:39:31 2011 +0300
-
-    (Re?)set bitmap cache size when initializing bitmaps.
-    
-    Without something like this, when built with gcc 4.6, the cache's max
-    size ends up set to 0 (it's initialized before setup is done) and we
-    crash in cache[].
-
-diff --git a/bitmap.c b/bitmap.c
-index 5319333..8159536 100644
---- a/bitmap.c
-+++ b/bitmap.c
-@@ -90,6 +90,7 @@ void cText2SkinBitmap::Init(void) {
- #ifdef HAVE_IMAGEMAGICK
- 	InitializeMagick(NULL);
- #endif
-+	mCache.SetMaxItems(Text2SkinSetup.MaxCacheFill);
- }
- 
- cText2SkinBitmap::cText2SkinBitmap(void) {
-diff --git a/cache.h b/cache.h
-index b3cc782..f37e693 100644
---- a/cache.h
-+++ b/cache.h
-@@ -31,6 +31,7 @@ public:
- 	bool Contains(const key_type &Key);
- 	data_type &operator[](const key_type &Key);
- 	uint Count(void) { return mUsage.size(); }
-+	void SetMaxItems(uint MaxItems) { mMaxItems = MaxItems; }
- };
- 
- template<class key_type, class data_type>
-@@ -85,7 +86,7 @@ data_type &cxCache<key_type, data_type>::operator[](const key_type &Key)
- 		return it->second;
- 	} 
- 
--	if (mUsage.size() == mMaxItems) {
-+	while (mUsage.size() >= mMaxItems) {
- 		item_iterator it = mItems.find(*mUsage.begin());
- 		DeleteObject(it->first, it->second);
- 		mUsage.erase(mUsage.begin());
diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index 574e0eb..f23dada 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -1,25 +1,18 @@
-%global pname     text2skin
-%global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
-%global datadir   %(vdr-config --datadir    2>/dev/null || echo ERROR)
-%global apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
-%global __provides_exclude_from ^%{plugindir}/
+%global pname   text2skin
+%global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$
 # imagelib: imagemagick, graphicsmagick, imlib2 or %%{nil}
 %{!?imagelib: %global imagelib graphicsmagick}
 
 Name:           vdr-%{pname}
-Version:        1.3.1
-Release:        3%{?dist}
+Version:        1.3.2
+Release:        1%{?dist}
 Summary:        OSD skin plugin for VDR
 
-Group:          Applications/Multimedia
 License:        GPL+
 URL:            http://projects.vdr-developer.org/projects/show/plg-text2skin
-Source0:        http://projects.vdr-developer.org/attachments/download/344/%{name}-%{version}.tgz
+Source0:        http://projects.vdr-developer.org/attachments/download/783/%{name}-%{version}.tgz
 Source1:        %{name}.conf
 Patch0:         %{name}-1.3-skindir.patch
-# In upstream post-1.3.1 git
-Patch1:         %{name}-1.3.1-cache-init.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%{imagelib}" == "imagemagick"
 BuildRequires:  ImageMagick-c++-devel
@@ -30,10 +23,9 @@ BuildRequires:  GraphicsMagick-c++-devel
 %if "%{imagelib}" == "imlib2"
 BuildRequires:  imlib2-devel
 %endif
-BuildRequires:  vdr-devel >= 1.6.0
+BuildRequires:  vdr-devel >= 1.6.0-41
 BuildRequires:  gawk
-BuildRequires:  gettext
-Requires:       vdr(abi)%{?_isa} = %{apiver}
+Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
 
 %description
 This plugin is designed to load and interpret a set of files
@@ -47,8 +39,7 @@ of the skin wishes.
 
 %prep
 %setup -q -n %{pname}-%{version}
-sed -e 's|/usr/share/vdr/|%{datadir}/|' %{PATCH0} | patch -p1
-%patch1 -p1
+sed -e 's|/usr/share/vdr/|%{vdr_datadir}/|' %{PATCH0} | patch -p1
 chmod -c -x contrib/*.pl
 
 
@@ -58,34 +49,35 @@ make %{?_smp_mflags} STRIP=: IMAGELIB=%{?imagelib} LIBDIR=. LOCALEDIR=./locale \
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 
-install -dm 755 $RPM_BUILD_ROOT%{plugindir}
-install -pm 755 libvdr-%{pname}.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
+install -dm 755 $RPM_BUILD_ROOT%{vdr_plugindir}
+install -pm 755 libvdr-%{pname}.so.%{vdr_apiversion} \
+    $RPM_BUILD_ROOT%{vdr_plugindir}
 
 install -Dpm 644 %{SOURCE1} \
     $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
 
-install -dm 755 $RPM_BUILD_ROOT%{datadir}/text2skin
+install -dm 755 $RPM_BUILD_ROOT%{vdr_datadir}/text2skin
 
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale
 cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 %find_lang %{name}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files -f %{name}.lang
-%doc CONTRIBUTORS COPYING HISTORY README Docs/*.txt contrib/skin_to_10.pl
+%doc CONTRIBUTORS COPYING HISTORY README Docs/*.txt Docs/text2skin*.rng
+%doc contrib/skin_to_10.pl
 %lang(de) %doc README.de
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
-%{plugindir}/libvdr-%{pname}.so.%{apiver}
-%{datadir}/text2skin/
+%{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion}
+%{vdr_datadir}/text2skin/
 
 
 %changelog
+* Sun Nov  6 2011 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-1
+- Update to 1.3.2.
+- Clean up specfile constructs no longer needed with Fedora or EL6+.
+
 * Tue May 31 2011 Ville Skyttä <ville.skytta@iki.fi> - 1.3.1-3
 - Patch to fix cache initialization crash when built with GCC 4.6.
 - Use __provides_exclude_from to filter Provides.

From 341d1e3cc852276cfe5ede8842b5a3eeecb6533e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 4 Dec 2011 22:04:00 +0200
Subject: [PATCH 15/30] Rebuild.

---
 vdr-text2skin.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index f23dada..ed6f7c8 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -5,7 +5,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OSD skin plugin for VDR
 
 License:        GPL+
@@ -74,6 +74,9 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 
 
 %changelog
+* Sun Dec  4 2011 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-2
+- Rebuild.
+
 * Sun Nov  6 2011 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-1
 - Update to 1.3.2.
 - Clean up specfile constructs no longer needed with Fedora or EL6+.

From cba4e87828f60b87f9c941ad98b64eb214a813ef Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 14 Jan 2012 01:48:32 -0600
Subject: [PATCH 16/30] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

---
 vdr-text2skin.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index ed6f7c8..6e32023 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -5,7 +5,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.3.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        OSD skin plugin for VDR
 
 License:        GPL+
@@ -74,6 +74,9 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 
 
 %changelog
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Sun Dec  4 2011 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-2
 - Rebuild.
 

From a832f28f6c5eedd28e8292df4be0cdea1cd4cb58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 15 Jan 2012 21:36:14 +0200
Subject: [PATCH 17/30] Rebuild.

---
 vdr-text2skin.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index 6e32023..e3cf928 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -5,7 +5,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.3.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        OSD skin plugin for VDR
 
 License:        GPL+
@@ -74,6 +74,9 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 
 
 %changelog
+* Sun Jan 15 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-4
+- Rebuild.
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 

From 30134e3ca31845810d768c976b7d2b3158ad33ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 21 Feb 2012 00:40:43 +0200
Subject: [PATCH 18/30] Rebuild.

---
 vdr-text2skin.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index e3cf928..572b6b5 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -5,7 +5,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.3.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        OSD skin plugin for VDR
 
 License:        GPL+
@@ -74,6 +74,9 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 
 
 %changelog
+* Mon Feb 20 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-5
+- Rebuild.
+
 * Sun Jan 15 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-4
 - Rebuild.
 

From 0e025f778eb2f91af1bf151d50a966491aa7d2c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 6 Mar 2012 23:17:45 +0200
Subject: [PATCH 19/30] Rebuild.

---
 vdr-text2skin.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index 572b6b5..f801b02 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -5,7 +5,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.3.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        OSD skin plugin for VDR
 
 License:        GPL+
@@ -74,6 +74,9 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 
 
 %changelog
+* Tue Mar 06 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-6
+- Rebuild.
+
 * Mon Feb 20 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-5
 - Rebuild.
 

From 0255b0510aa51dbe3ed7b244f415f584e0da1278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 11 Mar 2012 19:10:43 +0200
Subject: [PATCH 20/30] Rebuild.

---
 vdr-text2skin.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index f801b02..6dd7eec 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -5,7 +5,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.3.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        OSD skin plugin for VDR
 
 License:        GPL+
@@ -74,6 +74,9 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 
 
 %changelog
+* Sun Mar 11 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-7
+- Rebuild.
+
 * Tue Mar 06 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-6
 - Rebuild.
 

From 914ac9730f79ceafcec4b5271de38ee151c0cbee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 27 Mar 2012 23:55:41 +0300
Subject: [PATCH 21/30] Patch to build with VDR 1.7.27.

---
 vdr-text2skin-1.3.2-vdr1727.patch | 98 +++++++++++++++++++++++++++++++
 vdr-text2skin.spec                |  9 ++-
 2 files changed, 105 insertions(+), 2 deletions(-)
 create mode 100644 vdr-text2skin-1.3.2-vdr1727.patch

diff --git a/vdr-text2skin-1.3.2-vdr1727.patch b/vdr-text2skin-1.3.2-vdr1727.patch
new file mode 100644
index 0000000..d3141b4
--- /dev/null
+++ b/vdr-text2skin-1.3.2-vdr1727.patch
@@ -0,0 +1,98 @@
+diff --git a/common.c b/common.c
+index 8ca0315..c398fe1 100644
+--- a/common.c
++++ b/common.c
+@@ -255,11 +255,11 @@ int GetRecordingCuttedLength(const char *FileName, double FramesPerSecond, bool
+ 		int start = 1; // first frame
+ 		bool isStart = true;
+ 
+-		for (cMark *m = marks.First(); m; m = marks.GetNext(m->position)) {
++		for (cMark *m = marks.First(); m; m = marks.GetNext(m->Position())) {
+ 			if (isStart)
+-				start = m->position;
++				start = m->Position();
+ 			else
+-				length += (double)(m->position - start + 1 + diffIFrame) / (60 * FramesPerSecond); // [min]
++				length += (double)(m->Position() - start + 1 + diffIFrame) / (60 * FramesPerSecond); // [min]
+ 
+ 			isStart = !isStart;
+ 		}
+diff --git a/display.c b/display.c
+index 93086e5..ec510d7 100644
+--- a/display.c
++++ b/display.c
+@@ -1257,17 +1257,17 @@ cxType cText2SkinDisplayMenu::GetTokenData(const txToken &Token)
+ 
+ 	case tRecordingPriority:
+ 		return mRecording != NULL
+-		       ? (cxType)mRecording->priority
++		       ? (cxType)mRecording->Priority()
+ 		       : (cxType)false;
+ 
+ 	case tRecordingLifetime:
+ 		return mRecording != NULL
+-		       ? (cxType)mRecording->lifetime
++		       ? (cxType)mRecording->Lifetime()
+ 		       : (cxType)false;
+ 
+ 	case tRecordingDateTime:
+ 		return mRecording != NULL
+-		       ? (cxType)TimeType(mRecording->start, Token.Attrib.Text)
++		       ? (cxType)TimeType(mRecording->Start(), Token.Attrib.Text)
+ 		       : (cxType)false;
+ 
+ 	case tRecordingTitle:
+diff --git a/render.c b/render.c
+index 20b6976..9fdd0bf 100644
+--- a/render.c
++++ b/render.c
+@@ -597,14 +597,14 @@ void cText2SkinRender::DrawProgressbar(const txPoint &Pos, const txSize &Size, i
+ 		if (Marks) {
+ 			bool start = true;
+ 			for (const cMark *m = Marks->First(); m; m = Marks->Next(m)) {
+-				txPoint pt(Pos.x + m->position * Size.w / Total, Pos.y);
++				txPoint pt(Pos.x + m->Position() * Size.w / Total, Pos.y);
+ 				if (Selected && start) {
+ 					const cMark *m2 = Marks->Next(m);
+ 					DrawRectangle(txPoint(pt.x, Pos.y + Size.h / 3), 
+-					              txSize(((m2 ? m2->position : Total) - m->position) 
++					              txSize(((m2 ? m2->Position() : Total) - m->Position()) 
+ 					              * Size.w / Total + 1, Size.h - Size.h * 2 / 3 + 1), Selected);
+ 				}
+-				DrawMark(pt, Size, start, m->position == Current, false, Mark, Cur);
++				DrawMark(pt, Size, start, m->Position() == Current, false, Mark, Cur);
+ 				start = !start;
+ 			}
+ 		}
+@@ -614,15 +614,15 @@ void cText2SkinRender::DrawProgressbar(const txPoint &Pos, const txSize &Size, i
+ 		if (Marks) {
+ 			bool start = true;
+ 			for (const cMark *m = Marks->First(); m; m = Marks->Next(m)) {
+-				txPoint pt(Pos.x, Pos.y + m->position * Size.h / Total);
++				txPoint pt(Pos.x, Pos.y + m->Position() * Size.h / Total);
+ 				if (Selected && start) {
+ 					const cMark *m2 = Marks->Next(m);
+ 					DrawRectangle(txPoint(Pos.x + Size.w / 3, pt.y), 
+ 					              txSize(Size.w - Size.w * 2 / 3 + 1,
+-					              ((m2 ? m2->position : Total) - m->position)
++					              ((m2 ? m2->Position() : Total) - m->Position())
+ 					              * Size.h / Total + 1), Selected);
+ 				}
+-				DrawMark(pt, Size, start, m->position == Current, true, Mark, Cur);
++				DrawMark(pt, Size, start, m->Position() == Current, true, Mark, Cur);
+ 				start = !start;
+ 			}
+ 		}
+diff --git a/status.c b/status.c
+index 5ecd7c8..8cadc2f 100644
+--- a/status.c
++++ b/status.c
+@@ -314,7 +314,7 @@ cxType cText2SkinStatus::GetTokenData(const txToken &Token)
+ 
+ 	case tReplayDateTime:
+ 		return mReplay != NULL
+-		       ? (cxType)TimeType(mReplay->start, Token.Attrib.Text)
++		       ? (cxType)TimeType(mReplay->Start(), Token.Attrib.Text)
+ 		       : (cxType)false;
+ 
+ 	case tReplayShortText:
diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index 6dd7eec..a683ae6 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -5,7 +5,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.3.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        OSD skin plugin for VDR
 
 License:        GPL+
@@ -13,6 +13,7 @@ URL:            http://projects.vdr-developer.org/projects/show/plg-text2skin
 Source0:        http://projects.vdr-developer.org/attachments/download/783/%{name}-%{version}.tgz
 Source1:        %{name}.conf
 Patch0:         %{name}-1.3-skindir.patch
+Patch1:         %{name}-1.3.2-vdr1727.patch
 
 %if "%{imagelib}" == "imagemagick"
 BuildRequires:  ImageMagick-c++-devel
@@ -23,7 +24,7 @@ BuildRequires:  GraphicsMagick-c++-devel
 %if "%{imagelib}" == "imlib2"
 BuildRequires:  imlib2-devel
 %endif
-BuildRequires:  vdr-devel >= 1.6.0-41
+BuildRequires:  vdr-devel >= 1.7.21
 BuildRequires:  gawk
 Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
 
@@ -40,6 +41,7 @@ of the skin wishes.
 %prep
 %setup -q -n %{pname}-%{version}
 sed -e 's|/usr/share/vdr/|%{vdr_datadir}/|' %{PATCH0} | patch -p1
+%patch1 -p1
 chmod -c -x contrib/*.pl
 
 
@@ -74,6 +76,9 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 
 
 %changelog
+* Tue Mar 27 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-8
+- Patch to build with VDR 1.7.27.
+
 * Sun Mar 11 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-7
 - Rebuild.
 

From 37986847c07622f6821a17dd8972cdb34edc006b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 28 Jun 2012 00:14:06 +0300
Subject: [PATCH 22/30] Rebuild.

---
 vdr-text2skin.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index a683ae6..279a4f6 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -5,7 +5,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.3.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        OSD skin plugin for VDR
 
 License:        GPL+
@@ -76,6 +76,9 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 
 
 %changelog
+* Wed Jun 27 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-9
+- Rebuild.
+
 * Tue Mar 27 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-8
 - Patch to build with VDR 1.7.27.
 

From 9a0f9b92bf2fda42fe2f17bf3769d28da9373b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 19 Jul 2012 00:50:39 +0300
Subject: [PATCH 23/30] Rebuild.

---
 vdr-text2skin.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index 279a4f6..f01fa21 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -5,7 +5,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.3.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        OSD skin plugin for VDR
 
 License:        GPL+
@@ -76,6 +76,9 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 
 
 %changelog
+* Wed Jul 18 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-10
+- Rebuild.
+
 * Wed Jun 27 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-9
 - Rebuild.
 

From 7a88457be44bc3967dcba202e0a7efcd9c73104a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 13 Sep 2012 21:24:04 +0300
Subject: [PATCH 24/30] Adapt to VDR 1.7.30.

---
 vdr-text2skin.spec | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index f01fa21..bf825e8 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -5,7 +5,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.3.2
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        OSD skin plugin for VDR
 
 License:        GPL+
@@ -24,7 +24,7 @@ BuildRequires:  GraphicsMagick-c++-devel
 %if "%{imagelib}" == "imlib2"
 BuildRequires:  imlib2-devel
 %endif
-BuildRequires:  vdr-devel >= 1.7.21
+BuildRequires:  vdr-devel >= 1.7.30
 BuildRequires:  gawk
 Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
 
@@ -40,7 +40,7 @@ of the skin wishes.
 
 %prep
 %setup -q -n %{pname}-%{version}
-sed -e 's|/usr/share/vdr/|%{vdr_datadir}/|' %{PATCH0} | patch -p1
+sed -e 's|/usr/share/vdr/|%{vdr_resdir}/|' %{PATCH0} | patch -p1
 %patch1 -p1
 chmod -c -x contrib/*.pl
 
@@ -59,7 +59,7 @@ install -pm 755 libvdr-%{pname}.so.%{vdr_apiversion} \
 install -Dpm 644 %{SOURCE1} \
     $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
 
-install -dm 755 $RPM_BUILD_ROOT%{vdr_datadir}/text2skin
+install -dm 755 $RPM_BUILD_ROOT%{vdr_resdir}/text2skin
 
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale
 cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
@@ -72,10 +72,13 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 %lang(de) %doc README.de
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
 %{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion}
-%{vdr_datadir}/text2skin/
+%{vdr_resdir}/text2skin/
 
 
 %changelog
+* Thu Sep 13 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-11
+- Adapt to VDR 1.7.30.
+
 * Wed Jul 18 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-10
 - Rebuild.
 

From 647841af72f6ae6f92e54efb749adff621800f01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 2 Oct 2012 21:56:36 +0300
Subject: [PATCH 25/30] Rebuild.

---
 vdr-text2skin.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index bf825e8..e6c8111 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -5,7 +5,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.3.2
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        OSD skin plugin for VDR
 
 License:        GPL+
@@ -76,6 +76,9 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 
 
 %changelog
+* Tue Oct 02 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-12
+- Rebuild.
+
 * Thu Sep 13 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-11
 - Adapt to VDR 1.7.30.
 

From ffe032bcde7ead42c9533b13b740c2789da880cf Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Mon, 24 Dec 2012 09:17:08 -0600
Subject: [PATCH 26/30] rebuild (GraphicsMagick)

---
 vdr-text2skin.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index e6c8111..4429e7d 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -5,7 +5,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.3.2
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        OSD skin plugin for VDR
 
 License:        GPL+
@@ -76,6 +76,9 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 
 
 %changelog
+* Mon Dec 24 2012 Rex Dieter <rdieter@fedoraproject.org> 1.3.2-13
+- rebuild (GraphicsMagick)
+
 * Tue Oct 02 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-12
 - Rebuild.
 

From fb9e7cd314d750e1f3ce8c573d8b4b782fcca6ed Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 14 Feb 2013 20:42:07 -0600
Subject: [PATCH 27/30] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

---
 vdr-text2skin.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index 4429e7d..863df87 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -5,7 +5,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.3.2
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        OSD skin plugin for VDR
 
 License:        GPL+
@@ -76,6 +76,9 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 
 
 %changelog
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Mon Dec 24 2012 Rex Dieter <rdieter@fedoraproject.org> 1.3.2-13
 - rebuild (GraphicsMagick)
 

From 64d7a8f41ed1dacbbb30d1a989d0c201b90b6679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 19 Feb 2013 00:37:32 +0200
Subject: [PATCH 28/30] Rebuild.

---
 vdr-text2skin.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index 863df87..34f00ae 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -5,7 +5,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.3.2
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        OSD skin plugin for VDR
 
 License:        GPL+
@@ -76,6 +76,9 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 
 
 %changelog
+* Mon Feb 18 2013 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-15
+- Rebuild.
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 

From eb91206e9af203eaf843b470688ffe60d579c204 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 3 Mar 2013 22:07:48 +0200
Subject: [PATCH 29/30] Rebuild.

---
 vdr-text2skin.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
index 34f00ae..edb7a7a 100644
--- a/vdr-text2skin.spec
+++ b/vdr-text2skin.spec
@@ -5,7 +5,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.3.2
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        OSD skin plugin for VDR
 
 License:        GPL+
@@ -76,6 +76,9 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 
 
 %changelog
+* Sun Mar 03 2013 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-16
+- Rebuild.
+
 * Mon Feb 18 2013 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-15
 - Rebuild.
 

From 6d6afe56c641c01b615335b824a43ac78ccfdfec Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 12 Mar 2013 00:27:10 -0400
Subject: [PATCH 30/30] Retire vdr-text2skin - no maintainer

---
 dead.package                      |   1 +
 sources                           |   1 -
 vdr-text2skin-1.3-skindir.patch   |  38 ------
 vdr-text2skin-1.3.2-vdr1727.patch |  98 ---------------
 vdr-text2skin.conf                |   5 -
 vdr-text2skin.spec                | 201 ------------------------------
 6 files changed, 1 insertion(+), 343 deletions(-)
 create mode 100644 dead.package
 delete mode 100644 sources
 delete mode 100644 vdr-text2skin-1.3-skindir.patch
 delete mode 100644 vdr-text2skin-1.3.2-vdr1727.patch
 delete mode 100644 vdr-text2skin.conf
 delete mode 100644 vdr-text2skin.spec

diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..5e32ab9
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+This package was retired on 2013-03-11 due to a lack of a willing Fedora maintainer.
diff --git a/sources b/sources
deleted file mode 100644
index d20f190..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-e9cdf24d1a4dd1d65d72cbf0f1ff6df5  vdr-text2skin-1.3.2.tgz
diff --git a/vdr-text2skin-1.3-skindir.patch b/vdr-text2skin-1.3-skindir.patch
deleted file mode 100644
index acdaf5c..0000000
--- a/vdr-text2skin-1.3-skindir.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -up text2skin-1.3/common.c~ text2skin-1.3/common.c
---- text2skin-1.3/common.c~	2009-07-17 02:18:57.000000000 +0300
-+++ text2skin-1.3/common.c	2009-10-07 23:19:34.000000000 +0300
-@@ -14,7 +14,7 @@
- const std::string &SkinPath(void) 
- {
- 	// should never change
--	static std::string path = cPlugin::ConfigDirectory(PLUGIN_NAME_I18N);
-+	static std::string path = "/usr/share/vdr/text2skin";
- 	return path;
- }
- 
-diff -up text2skin-1.3/README~ text2skin-1.3/README
---- text2skin-1.3/README~	2009-07-17 02:16:35.000000000 +0300
-+++ text2skin-1.3/README	2009-10-07 23:19:34.000000000 +0300
-@@ -68,6 +68,9 @@ root@linux # ./vdr -P text2skin
- Where to put the skins:
- -----------------------
- 
-+*** rpm package note: this text2skin package has been patched to load skins
-+*** from /usr/share/vdr/text2skin instead of the path documented below.
-+
- As you might know, VDR has a subfolder "plugins" inside it's configuration 
- folder, where all plugin-related files should reside. If you don't know, where
- this could be, look into the folder you gave to VDR with the -v parameter 
-diff -up text2skin-1.3/README.de~ text2skin-1.3/README.de
---- text2skin-1.3/README.de~	2009-09-06 18:31:27.000000000 +0300
-+++ text2skin-1.3/README.de	2009-10-07 23:19:34.000000000 +0300
-@@ -73,6 +73,9 @@ root@linux # ./vdr -P text2skin
- Wo die Skins hingehören:
- ------------------------
- 
-+*** rpm package note: this text2skin package has been patched to load skins
-+*** from /usr/share/vdr/text2skin instead of the path documented below.
-+
- Wie Sie vielleicht wissen, hat VDR einen Unterordner "plugins" innerhalb seines
- Konfigurationsordners, in dem alle Dateien, die zu Plugins gehören, enthalten
- sein sollten. Wenn Sie nicht wissen, wo das sein könnte, schauen Sie in dem
diff --git a/vdr-text2skin-1.3.2-vdr1727.patch b/vdr-text2skin-1.3.2-vdr1727.patch
deleted file mode 100644
index d3141b4..0000000
--- a/vdr-text2skin-1.3.2-vdr1727.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff --git a/common.c b/common.c
-index 8ca0315..c398fe1 100644
---- a/common.c
-+++ b/common.c
-@@ -255,11 +255,11 @@ int GetRecordingCuttedLength(const char *FileName, double FramesPerSecond, bool
- 		int start = 1; // first frame
- 		bool isStart = true;
- 
--		for (cMark *m = marks.First(); m; m = marks.GetNext(m->position)) {
-+		for (cMark *m = marks.First(); m; m = marks.GetNext(m->Position())) {
- 			if (isStart)
--				start = m->position;
-+				start = m->Position();
- 			else
--				length += (double)(m->position - start + 1 + diffIFrame) / (60 * FramesPerSecond); // [min]
-+				length += (double)(m->Position() - start + 1 + diffIFrame) / (60 * FramesPerSecond); // [min]
- 
- 			isStart = !isStart;
- 		}
-diff --git a/display.c b/display.c
-index 93086e5..ec510d7 100644
---- a/display.c
-+++ b/display.c
-@@ -1257,17 +1257,17 @@ cxType cText2SkinDisplayMenu::GetTokenData(const txToken &Token)
- 
- 	case tRecordingPriority:
- 		return mRecording != NULL
--		       ? (cxType)mRecording->priority
-+		       ? (cxType)mRecording->Priority()
- 		       : (cxType)false;
- 
- 	case tRecordingLifetime:
- 		return mRecording != NULL
--		       ? (cxType)mRecording->lifetime
-+		       ? (cxType)mRecording->Lifetime()
- 		       : (cxType)false;
- 
- 	case tRecordingDateTime:
- 		return mRecording != NULL
--		       ? (cxType)TimeType(mRecording->start, Token.Attrib.Text)
-+		       ? (cxType)TimeType(mRecording->Start(), Token.Attrib.Text)
- 		       : (cxType)false;
- 
- 	case tRecordingTitle:
-diff --git a/render.c b/render.c
-index 20b6976..9fdd0bf 100644
---- a/render.c
-+++ b/render.c
-@@ -597,14 +597,14 @@ void cText2SkinRender::DrawProgressbar(const txPoint &Pos, const txSize &Size, i
- 		if (Marks) {
- 			bool start = true;
- 			for (const cMark *m = Marks->First(); m; m = Marks->Next(m)) {
--				txPoint pt(Pos.x + m->position * Size.w / Total, Pos.y);
-+				txPoint pt(Pos.x + m->Position() * Size.w / Total, Pos.y);
- 				if (Selected && start) {
- 					const cMark *m2 = Marks->Next(m);
- 					DrawRectangle(txPoint(pt.x, Pos.y + Size.h / 3), 
--					              txSize(((m2 ? m2->position : Total) - m->position) 
-+					              txSize(((m2 ? m2->Position() : Total) - m->Position()) 
- 					              * Size.w / Total + 1, Size.h - Size.h * 2 / 3 + 1), Selected);
- 				}
--				DrawMark(pt, Size, start, m->position == Current, false, Mark, Cur);
-+				DrawMark(pt, Size, start, m->Position() == Current, false, Mark, Cur);
- 				start = !start;
- 			}
- 		}
-@@ -614,15 +614,15 @@ void cText2SkinRender::DrawProgressbar(const txPoint &Pos, const txSize &Size, i
- 		if (Marks) {
- 			bool start = true;
- 			for (const cMark *m = Marks->First(); m; m = Marks->Next(m)) {
--				txPoint pt(Pos.x, Pos.y + m->position * Size.h / Total);
-+				txPoint pt(Pos.x, Pos.y + m->Position() * Size.h / Total);
- 				if (Selected && start) {
- 					const cMark *m2 = Marks->Next(m);
- 					DrawRectangle(txPoint(Pos.x + Size.w / 3, pt.y), 
- 					              txSize(Size.w - Size.w * 2 / 3 + 1,
--					              ((m2 ? m2->position : Total) - m->position)
-+					              ((m2 ? m2->Position() : Total) - m->Position())
- 					              * Size.h / Total + 1), Selected);
- 				}
--				DrawMark(pt, Size, start, m->position == Current, true, Mark, Cur);
-+				DrawMark(pt, Size, start, m->Position() == Current, true, Mark, Cur);
- 				start = !start;
- 			}
- 		}
-diff --git a/status.c b/status.c
-index 5ecd7c8..8cadc2f 100644
---- a/status.c
-+++ b/status.c
-@@ -314,7 +314,7 @@ cxType cText2SkinStatus::GetTokenData(const txToken &Token)
- 
- 	case tReplayDateTime:
- 		return mReplay != NULL
--		       ? (cxType)TimeType(mReplay->start, Token.Attrib.Text)
-+		       ? (cxType)TimeType(mReplay->Start(), Token.Attrib.Text)
- 		       : (cxType)false;
- 
- 	case tReplayShortText:
diff --git a/vdr-text2skin.conf b/vdr-text2skin.conf
deleted file mode 100644
index dd76ad0..0000000
--- a/vdr-text2skin.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Configuration snippet for vdr-text2skin                            -*- sh -*-
-#
-# Add command line options to pass to the text2skin plugin to PLUGIN_OPTIONS.
-
-PLUGIN_OPTIONS=""
diff --git a/vdr-text2skin.spec b/vdr-text2skin.spec
deleted file mode 100644
index edb7a7a..0000000
--- a/vdr-text2skin.spec
+++ /dev/null
@@ -1,201 +0,0 @@
-%global pname   text2skin
-%global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$
-# imagelib: imagemagick, graphicsmagick, imlib2 or %%{nil}
-%{!?imagelib: %global imagelib graphicsmagick}
-
-Name:           vdr-%{pname}
-Version:        1.3.2
-Release:        16%{?dist}
-Summary:        OSD skin plugin for VDR
-
-License:        GPL+
-URL:            http://projects.vdr-developer.org/projects/show/plg-text2skin
-Source0:        http://projects.vdr-developer.org/attachments/download/783/%{name}-%{version}.tgz
-Source1:        %{name}.conf
-Patch0:         %{name}-1.3-skindir.patch
-Patch1:         %{name}-1.3.2-vdr1727.patch
-
-%if "%{imagelib}" == "imagemagick"
-BuildRequires:  ImageMagick-c++-devel
-%endif
-%if "%{imagelib}" == "graphicsmagick"
-BuildRequires:  GraphicsMagick-c++-devel
-%endif
-%if "%{imagelib}" == "imlib2"
-BuildRequires:  imlib2-devel
-%endif
-BuildRequires:  vdr-devel >= 1.7.30
-BuildRequires:  gawk
-Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
-
-%description
-This plugin is designed to load and interpret a set of files
-describing the layout of VDR's on screen display and to make this
-"skin" available to VDR via Setup -> OSD in the main menu.  Of course
-it is possible to load more than one text based skin this way and to
-choose between them while running VDR.  All skins may be themeable
-(you can create your own color theme) and translatable as the author
-of the skin wishes.
-
-
-%prep
-%setup -q -n %{pname}-%{version}
-sed -e 's|/usr/share/vdr/|%{vdr_resdir}/|' %{PATCH0} | patch -p1
-%patch1 -p1
-chmod -c -x contrib/*.pl
-
-
-%build
-make %{?_smp_mflags} STRIP=: IMAGELIB=%{?imagelib} LIBDIR=. LOCALEDIR=./locale \
-    VDRDIR=%{_libdir}/vdr all
-
-
-%install
-
-install -dm 755 $RPM_BUILD_ROOT%{vdr_plugindir}
-install -pm 755 libvdr-%{pname}.so.%{vdr_apiversion} \
-    $RPM_BUILD_ROOT%{vdr_plugindir}
-
-install -Dpm 644 %{SOURCE1} \
-    $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
-
-install -dm 755 $RPM_BUILD_ROOT%{vdr_resdir}/text2skin
-
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale
-cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
-%find_lang %{name}
-
-
-%files -f %{name}.lang
-%doc CONTRIBUTORS COPYING HISTORY README Docs/*.txt Docs/text2skin*.rng
-%doc contrib/skin_to_10.pl
-%lang(de) %doc README.de
-%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
-%{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion}
-%{vdr_resdir}/text2skin/
-
-
-%changelog
-* Sun Mar 03 2013 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-16
-- Rebuild.
-
-* Mon Feb 18 2013 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-15
-- Rebuild.
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Mon Dec 24 2012 Rex Dieter <rdieter@fedoraproject.org> 1.3.2-13
-- rebuild (GraphicsMagick)
-
-* Tue Oct 02 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-12
-- Rebuild.
-
-* Thu Sep 13 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-11
-- Adapt to VDR 1.7.30.
-
-* Wed Jul 18 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-10
-- Rebuild.
-
-* Wed Jun 27 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-9
-- Rebuild.
-
-* Tue Mar 27 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-8
-- Patch to build with VDR 1.7.27.
-
-* Sun Mar 11 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-7
-- Rebuild.
-
-* Tue Mar 06 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-6
-- Rebuild.
-
-* Mon Feb 20 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-5
-- Rebuild.
-
-* Sun Jan 15 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-4
-- Rebuild.
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Sun Dec  4 2011 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-2
-- Rebuild.
-
-* Sun Nov  6 2011 Ville Skyttä <ville.skytta@iki.fi> - 1.3.2-1
-- Update to 1.3.2.
-- Clean up specfile constructs no longer needed with Fedora or EL6+.
-
-* Tue May 31 2011 Ville Skyttä <ville.skytta@iki.fi> - 1.3.1-3
-- Patch to fix cache initialization crash when built with GCC 4.6.
-- Use __provides_exclude_from to filter Provides.
-- Clean up some no longer needed specfile cruft.
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Jun 22 2010 Ville Skyttä <ville.skytta@iki.fi> - 1.3.1-1
-- Update to 1.3.1 (#606725).
-
-* Wed Oct  7 2009 Ville Skyttä <ville.skytta@iki.fi> - 1.3-1
-- Update to 1.3 (#527682).
-- Filter out autoprovided libvdr-*.so.* (if %%filter_setup is available).
-
-* Tue Sep  1 2009 Ville Skyttä <ville.skytta@iki.fi> - 1.2-3.git97c95bc
-- Update to git revision 97c95bc for several bugfixes and better fonts handling.
-- Build with GraphicsMagick instead of imlib2 by default.
-- Make vdr(abi) dependency ISA qualified.
-- Install translations.
-- Use %%global instead of %%define.
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Thu Jul  9 2009 Ville Skyttä <ville.skytta@iki.fi> - 1.2-1
-- Update to 1.2.
-- Specfile cleanups.
-- Fix spelling errors in description.
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-24.cvsext0.10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Mon Apr  7 2008 Ville Skyttä <ville.skytta@iki.fi> - 1.1-23.cvsext0.10
-- Update to 1.1-cvs_ext-0.10.
-- Build for VDR 1.6.0.
-
-* Sun Apr  6 2008 Ville Skyttä <ville.skytta@iki.fi> - 1.1-22.20051217cvs
-- Apply VDR 1.5+ patches from e-tobi.net Debian package.
-
-* Fri Jan  4 2008 Ville Skyttä <ville.skytta@iki.fi> - 1.1-21.20051217cvs
-- Fix build with gcc 4.3's cleaned up C++ headers.
-
-* Wed Aug 22 2007 Ville Skyttä <ville.skytta@iki.fi> - 1.1-20.20051217cvs
-- BuildRequires: gawk for extracting APIVERSION.
-
-* Tue Aug  7 2007 Ville Skyttä <ville.skytta@iki.fi> - 1.1-19.20051217cvs
-- License: GPL+
-
-* Sun Apr  8 2007 Ville Skyttä <ville.skytta@iki.fi> - 1.1-18.20051217cvs
-- Grab potential XML parse buffer overflow fix from upstream CVS.
-
-* Sun Nov 19 2006 Ville Skyttä <ville.skytta@iki.fi> - 1.1-16.20051217cvs
-- Migrate real skins directory to /usr/share/vdr/text2skin.
-- Patch for freetype 2.2 compatibility.
-
-* Sat Nov  4 2006 Ville Skyttä <ville.skytta@iki.fi> - 1.1-15.20051217
-- Build with imlib2 instead of imagemagick by default due to #212478.
-- Build for VDR 1.4.4.
-
-* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.1-14
-- rebuilt for unwind info generation, broken in gcc-4.1.1-21
-
-* Sat Sep 23 2006 Ville Skyttä <ville.skytta@iki.fi> - 1.1-13.20051217
-- Rebuild for VDR 1.4.3.
-
-* Sun Aug  6 2006 Ville Skyttä <ville.skytta@iki.fi> - 1.1-12.20051217
-- Rebuild for VDR 1.4.1-3.
-
-* Sun Jun 11 2006 Ville Skyttä <ville.skytta@iki.fi> - 1.1-11.20051217
-- Rebuild for VDR 1.4.1.
-
-* Sun Apr 30 2006 Ville Skyttä <ville.skytta@iki.fi> - 1.1-10.20051217
-- Rebuild for VDR 1.4.0.