rpms/vdr-text2skin/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 vdr-text2skin.spec, 1.5, 1.6 vdr-text2skin-1.1cvs-cvsfixes.patch, 1.1, NONE vdr-text2skin-1.1cvs-freetype22.patch, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/vdr-text2skin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28164

Modified Files:
	.cvsignore sources vdr-text2skin.spec 
Removed Files:
	vdr-text2skin-1.1cvs-cvsfixes.patch 
	vdr-text2skin-1.1cvs-freetype22.patch 
Log Message:
* 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.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-text2skin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Apr 2007 17:39:43 -0000	1.2
+++ .cvsignore	7 Apr 2008 20:56:44 -0000	1.3
@@ -1 +1 @@
-vdr-text2skin-1.1cvs-20051217.tgz
+vdr-text2skin-1.1-cvs_ext-0.10.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-text2skin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Apr 2007 17:39:43 -0000	1.2
+++ sources	7 Apr 2008 20:56:44 -0000	1.3
@@ -1 +1 @@
-f59bba08b3ded6c6a044e715e1669e0d  vdr-text2skin-1.1cvs-20051217.tgz
+92d5e0612f59f16190db93ae817f08ae  vdr-text2skin-1.1-cvs_ext-0.10.tgz


Index: vdr-text2skin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-text2skin/devel/vdr-text2skin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vdr-text2skin.spec	6 Apr 2008 18:22:41 -0000	1.5
+++ vdr-text2skin.spec	7 Apr 2008 20:56:44 -0000	1.6
@@ -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 @@
 
 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 @@
 
 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 @@
 
 
 %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.
 


--- vdr-text2skin-1.1cvs-cvsfixes.patch DELETED ---


--- vdr-text2skin-1.1cvs-freetype22.patch DELETED ---