rpms/vdr-epgsearch/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 vdr-epgsearch.spec, 1.4, 1.5 vdr-epgsearch-0.9.25.beta16-long-shorttext.patch, 1.1, NONE

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/vdr-epgsearch/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14276

Modified Files:
	.cvsignore sources vdr-epgsearch.spec 
Removed Files:
	vdr-epgsearch-0.9.25.beta16-long-shorttext.patch 
Log Message:
* Sun Jun 20 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.9.25-0.4.beta17
- Update to 0.9.25.beta17; "long short text" patch applied upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-epgsearch/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	1 Feb 2010 22:10:14 -0000	1.4
+++ .cvsignore	20 Jun 2010 10:30:44 -0000	1.5
@@ -1 +1 @@
-vdr-epgsearch-0.9.25.beta16.tgz
+vdr-epgsearch-0.9.25.beta17.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-epgsearch/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	1 Feb 2010 22:10:14 -0000	1.4
+++ sources	20 Jun 2010 10:30:44 -0000	1.5
@@ -1 +1 @@
-e42d372dd8b0e07de9d367da6e3c7ce9  vdr-epgsearch-0.9.25.beta16.tgz
+e5169b0a390e8f225d32915604bd2bab  vdr-epgsearch-0.9.25.beta17.tgz


Index: vdr-epgsearch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-epgsearch/devel/vdr-epgsearch.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- vdr-epgsearch.spec	17 Mar 2010 18:48:32 -0000	1.4
+++ vdr-epgsearch.spec	20 Jun 2010 10:30:44 -0000	1.5
@@ -4,7 +4,7 @@
 %global vardir    %(vdr-config --vardir     2>/dev/null || echo ERROR)
 %global apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
 %global vdr_user  %(vdr-config --user       2>/dev/null || echo ERROR)
-%global beta      beta16
+%global beta      beta17
 
 Name:           vdr-%{pname}
 Version:        0.9.25
@@ -21,8 +21,6 @@ Source3:        %{name}-conflictcheckonl
 Source4:        %{name}-quickepgsearch.conf
 # Fedora specific, no need to send upstream
 Patch0:         %{name}-0.9.25.beta15-fedora.patch
-# http://www.vdr-developer.org/mantisbt/view.php?id=566
-Patch1:         %{name}-0.9.25.beta16-long-shorttext.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  vdr-devel
@@ -38,9 +36,7 @@ reusable queries which can be used as dy
 
 %prep
 %setup -q -n %{pname}-%{version}.%{beta}
-find . -name "*~" -delete # unclean 0.9.25.beta16 tarball
 sed -e 's|__VARDIR__|%{vardir}|g' %{PATCH0} | %{__patch} --fuzz=0
-%patch1 -p1
 
 for f in scripts/epgsearchcmds-french.conf conf/epgsearchcats.conf-tvm2vdr* ; do
     iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
@@ -102,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jun 20 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.9.25-0.4.beta17
+- Update to 0.9.25.beta17; "long short text" patch applied upstream.
+
 * Wed Mar 17 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.9.25-0.4.beta16
 - Patch to fix max file name length overflow with long "short" texts.
 


--- vdr-epgsearch-0.9.25.beta16-long-shorttext.patch DELETED ---