Thu Oct 15 18:08:07 UTC 2009

Author: scop

Update of /cvs/pkgs/rpms/vdr-epgsearch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1056

Modified Files:
	.cvsignore sources vdr-epgsearch.spec 
Added Files:
	vdr-epgsearch-0.9.25.beta15-fedora.patch 
	vdr-epgsearch-0.9.25.beta15-finnish.patch 
	vdr-epgsearch-0.9.25.beta15-regexlib.patch 
Removed Files:
	vdr-epgsearch-0.9.25.beta14-fedora.patch 
	vdr-epgsearch-0.9.25.beta14-finnish.patch 
	vdr-epgsearch-0.9.25.beta14-mansect.patch 
	vdr-epgsearch-0.9.25.beta14-regexinc.patch 
	vdr-epgsearch-0.9.25.beta14-regexlib.patch 
	vdr-epgsearch-0.9.25.beta14-sendmail.patch 
Log Message:
* Thu Oct 15 2009 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.9.25-0.3.beta15
- Update to 0.9.25.beta15.
- Sendmail, regex includes and man section patches applied upstream.
- Point URL to English version of the project home page.


vdr-epgsearch-0.9.25.beta15-fedora.patch:
 epgsearch.c    |   22 +++++++++++-----------
 epgsearchcfg.c |    2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

--- NEW FILE vdr-epgsearch-0.9.25.beta15-fedora.patch ---
diff -up epgsearch-0.9.25.beta15/epgsearch.c~ epgsearch-0.9.25.beta15/epgsearch.c
--- epgsearch-0.9.25.beta15/epgsearch.c~	2009-09-23 19:53:21.000000000 +0300
+++ epgsearch-0.9.25.beta15/epgsearch.c	2009-10-15 01:30:59.000000000 +0300
@@ -83,7 +83,7 @@ int cLogFile::loglevellimit = 0;
 bool cPluginEpgsearch::VDR_readyafterStartup = false;
 
 // external SVDRPCommand
-const char *cSVDRPClient::SVDRPSendCmd = "svdrpsend.pl";
+const char *cSVDRPClient::SVDRPSendCmd = "svdrpsend";
 
 cPluginEpgsearch::cPluginEpgsearch(void)
 {
@@ -447,16 +447,16 @@ bool cPluginEpgsearch::Start(void)
    LoadUserVars();
    LoadConfD();
 
-   ChannelGroups.Load(AddDirectory(CONFIGDIR, "epgsearchchangrps.conf"), true);
-   Blacklists.Load(AddDirectory(CONFIGDIR, "epgsearchblacklists.conf"));
-   SearchExts.Load(AddDirectory(CONFIGDIR, "epgsearch.conf"));
-   SearchTemplates.Load(AddDirectory(CONFIGDIR, "epgsearchtemplates.conf"));
-   RecsDone.Load(AddDirectory(CONFIGDIR, "epgsearchdone.data"));
-   SwitchTimers.Load(AddDirectory(CONFIGDIR, "epgsearchswitchtimers.conf"));
-   NoAnnounces.Load(AddDirectory(CONFIGDIR, "noannounce.conf"));
-   DefTimerCheckModes.Load(AddDirectory(CONFIGDIR, "deftimerchkmodes.conf"));
-   TimersDone.Load(AddDirectory(CONFIGDIR, "timersdone.conf"));
-   PendingNotifications.Load(AddDirectory(CONFIGDIR, "pendingnotifications.conf"));
+   ChannelGroups.Load("__VARDIR__/epgsearch/epgsearchchangrps.conf", true);
+   Blacklists.Load("__VARDIR__/epgsearch/epgsearchblacklists.conf");
+   SearchExts.Load("__VARDIR__/epgsearch/epgsearch.conf");
+   SearchTemplates.Load("__VARDIR__/epgsearch/epgsearchtemplates.conf");
+   RecsDone.Load("__VARDIR__/epgsearch/epgsearchdone.data");
+   SwitchTimers.Load("__VARDIR__/epgsearch/epgsearchswitchtimers.conf");
+   NoAnnounces.Load("__VARDIR__/epgsearch/noannounce.conf");
+   DefTimerCheckModes.Load("__VARDIR__/epgsearch/deftimerchkmodes.conf");
+   TimersDone.Load("__VARDIR__/epgsearch/timersdone.conf");
+   PendingNotifications.Load("__VARDIR__/epgsearch/pendingnotifications.conf");
 
    cSearchTimerThread::Init(this);    
    cSwitchTimerThread::Init();    
diff -up epgsearch-0.9.25.beta15/epgsearchcfg.c~ epgsearch-0.9.25.beta15/epgsearchcfg.c
--- epgsearch-0.9.25.beta15/epgsearchcfg.c~	2009-09-22 21:13:52.000000000 +0300
+++ epgsearch-0.9.25.beta15/epgsearchcfg.c	2009-10-15 01:31:07.000000000 +0300
@@ -76,7 +76,7 @@ cEPGSearchConfig::cEPGSearchConfig(void)
   strcpy(MailAuthUser, "");
   strcpy(MailAuthPass, "");
   strcpy(LastMailConflicts, "");
-  mailViaScript = 1;
+  mailViaScript = 0;
   manualTimerCheckDefault = 0;
   noAnnounceWhileReplay = 0;
   TimerProgRepeat = 0;

vdr-epgsearch-0.9.25.beta15-finnish.patch:
 fi_FI.po |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

--- NEW FILE vdr-epgsearch-0.9.25.beta15-finnish.patch ---

diff --git a/po/fi_FI.po b/po/fi_FI.po
index f43dbfb..ce89afe 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger at gmx.de>\n"
 "POT-Creation-Date: 2009-09-21 19:28+0200\n"
-"PO-Revision-Date: 2009-07-19 23:22+0200\n"
+"PO-Revision-Date: 2009-10-15 20:52+0200\n"
 "Last-Translator: Ville SkyttÃ¤ <ville.skytta at iki.fi>\n"
 "Language-Team:  <vdr at linuxtv.org>\n"
 "MIME-Version: 1.0\n"
@@ -495,7 +495,7 @@ msgid "Help$Set this to 'yes' if you want to get an email notification about the
 msgstr "TÃ¤llÃ¤ asetuksella saat ilmoitukset automaattisesti lisÃ¤tyistÃ¤ hakuajastimista sÃ¤hkÃ¶postiisi."
 
 msgid "Time between mails [h]"
-msgstr ""
+msgstr "SÃ¤hkÃ¶postin lÃ¤hetysvÃ¤li [h]"
 
 msgid ""
 "Help$Specifiy how much time in [h] you would\n"
@@ -503,6 +503,10 @@ msgid ""
 "With '0' you get a new mail after each\n"
 "search timer update with new results."
 msgstr ""
+"VÃ¤himmÃ¤isvÃ¤liaika tunteina sÃ¤hkÃ¶postien\n"
+"lÃ¤hetykselle. MikÃ¤li 0, uusi sÃ¤hkÃ¶posti\n"
+"lÃ¤hetetÃ¤Ã¤n aina hakuajastimen pÃ¤ivittyessÃ¤\n"
+"uusilla tuloksilla."
 
 msgid "Timer conflict notification"
 msgstr "Ilmoitukset pÃ¤Ã¤llekkÃ¤isistÃ¤ ajastimista"
@@ -588,7 +592,7 @@ msgid "No timers were deleted."
 msgstr "YhtÃ¤Ã¤n ajastinta ei poistettu."
 
 msgid "No new events to announce."
-msgstr ""
+msgstr "Ei uusia ilmoitettavia tapahtumia."
 
 msgid "This version of EPGSearch does not support this service!"
 msgstr "EPGSearch-laajennos ei tarjoa vaadittavaa palvelua!"
@@ -954,9 +958,8 @@ msgstr "Muokkaa hakua"
 msgid "Record"
 msgstr "Tallenna"
 
-#, fuzzy
 msgid "Announce by OSD"
-msgstr "muistutus"
+msgstr "muistutus kuvaruutunÃ¤ytÃ¶lle"
 
 msgid "Switch only"
 msgstr "kanavanvaihto"
@@ -964,9 +967,8 @@ msgstr "kanavanvaihto"
 msgid "Announce and switch"
 msgstr "muistutus ja kanavanvaihto"
 
-#, fuzzy
 msgid "Announce by mail"
-msgstr "muistutus"
+msgstr "muistutus sÃ¤hkÃ¶postitse"
 
 msgid "Selection"
 msgstr "valittu"
@@ -1237,3 +1239,4 @@ msgstr "%02ldh"
 #, c-format
 msgid "in %02ldm"
 msgstr "%02ldm"
+

vdr-epgsearch-0.9.25.beta15-regexlib.patch:
 INSTALL                    |    8 ++++----
 INSTALL.DE                 |    6 +++---
 Makefile                   |   23 ++++++++---------------
 doc-src/en/epgsearch.1.txt |    4 ++--
 4 files changed, 17 insertions(+), 24 deletions(-)

--- NEW FILE vdr-epgsearch-0.9.25.beta15-regexlib.patch ---
diff -up epgsearch-0.9.25.beta15/doc-src/en/epgsearch.1.txt~ epgsearch-0.9.25.beta15/doc-src/en/epgsearch.1.txt
--- epgsearch-0.9.25.beta15/doc-src/en/epgsearch.1.txt~	2009-09-22 21:03:17.000000000 +0300
+++ epgsearch-0.9.25.beta15/doc-src/en/epgsearch.1.txt	2009-10-15 01:37:21.000000000 +0300
@@ -208,8 +208,8 @@ With 'Regular expression' you can setup 
 search term. You don't need a leading and trailing '/' in the
 expression. By default these are POSIX extended regular expressions.
 If you like to have Herl compatible regular expression, simply edit
-the plugins Makefile and uncomment #HAVE_PCREPOSIX=1 to
-HAVE_PCREPOSIX=1 (you will need pcreposix installed, comes with
+the plugins Makefile and uncomment '#REGEXLIB = pcre' to
+'REGEXLIB = pcre' (you will need pcreposix installed, comes with
 libpcre from www.pcre.org, but it's already part of most distributions).
 
 See also C<epgsearch(4)> 'Description of the search process'.
diff -up epgsearch-0.9.25.beta15/INSTALL~ epgsearch-0.9.25.beta15/INSTALL
--- epgsearch-0.9.25.beta15/INSTALL~	2009-08-23 21:54:24.000000000 +0300
+++ epgsearch-0.9.25.beta15/INSTALL	2009-10-15 01:37:22.000000000 +0300
@@ -8,8 +8,8 @@ libpcre
 -------
 For support of Perl compatible regular expressions in a search you have to use
 libpcre:  
-simply edit the plugins Makefile and uncomment '#HAVE_PCREPOSIX=1' to
-'HAVE_PCREPOSIX=1' or append 'HAVE_PCREPOSIX=1' to your 'make plugins'
+simply edit the plugins Makefile and uncomment '#REGEXLIB = pcre' to
+'REGEXLIB = pcre' or append 'REGEXLIB=pcre' to your 'make plugins'
 call. (you will need pcreposix installed, comes with libpcre from
 www.pcre.org, but it's already part of most distributions
 HINT: if all compiles well, but after starting VDR you get:
@@ -20,7 +20,7 @@ update libpcre from www.pcre.org and rec
 
 There seems to be a problem with PCRE on some systems, that produce a crash
 when using regexp. Til now, I could not find the reason. So perhaps dont use
-HAVE_PCREPOSIX=1, if you don't really need it.
+REGEXLIB=pcre, if you don't really need it.
 
 libtre
 ------
@@ -29,7 +29,7 @@ search patterns with a maximum of 31 cha
 if more than 31 characters are used. To avoid this limitation you can use the
 TRE package (http://laurikari.net/tre/). Install tre (on debian: 
 apt-get install tre-agrep libtre4 libtre-dev) and activate epgsearch's support
-for it in the Makefile by uncommenting '#HAVE_LIBTRE=1' to 'HAVE_LIBTRE=1' or append
+for it in the Makefile by uncommenting '#REGEXLIB = pcre' to 'REGEXLIB = tre' or append
 it to your 'make plugins' call. After recompiling epgsearch will now use an
 algorithm similiar to 'agrep' with no limits.
 
diff -up epgsearch-0.9.25.beta15/INSTALL.DE~ epgsearch-0.9.25.beta15/INSTALL.DE
--- epgsearch-0.9.25.beta15/INSTALL.DE~	2009-08-23 21:54:24.000000000 +0300
+++ epgsearch-0.9.25.beta15/INSTALL.DE	2009-10-15 01:37:24.000000000 +0300
@@ -2,8 +2,8 @@ Hier gibt es nichts besonderes. Bitte wi
 installieren (entpacken, soft link, make plugins). Eine kleine
 Besonderheit: Wer lieber mit Perl compatible regular expressions in
 der Suche arbeitet, sollte einfach im Makefile des Plugins
-#HAVE_PCREPOSIX=1 in HAVE_PCREPOSIX=1 ändern oder einfach
-HAVE_PCREPOSIX an den 'make plugins'-Aufruf anhängen. Hierzu muss pcreposix
+'#REGEXLIB = pcre' in 'REGEXLIB = pcre' ändern oder einfach
+REGEXLIB=pcre an den 'make plugins'-Aufruf anhängen. Hierzu muss pcreposix
 installiert sein, das in der libpcre von www.pcre.org enthalten ist.
 Dies sollte aber in den meisten Distributionen bereits enthalten sein.
 
@@ -18,5 +18,5 @@ kompilieren.
 Scheinbar gibt es auf manchen Systemen Probleme mit PCRE, die sich in einem
 Crash äußern, wenn man reg. Ausdrücke benutzt. Da ich die Ursache bisher
 nicht
-finden konnte, empfehle ich deshalb auf HAVE_PCREPOSIX=1 zu verzichten, wenn
+finden konnte, empfehle ich deshalb auf REGEXLIB=pcre zu verzichten, wenn
 es nicht unbedingt notwendig ist.
diff -up epgsearch-0.9.25.beta15/Makefile~ epgsearch-0.9.25.beta15/Makefile
--- epgsearch-0.9.25.beta15/Makefile~	2009-09-23 19:48:58.000000000 +0300
+++ epgsearch-0.9.25.beta15/Makefile	2009-10-15 01:37:09.000000000 +0300
@@ -23,15 +23,11 @@ AUTOCONFIG=1
 ### if AUTOCONFIG is not active (i.e. commented) you can manually enable the 
 ### optional modules or patches for other plugins
 ifndef AUTOCONFIG
-# uncomment this if you want to use Perl compatible regular expressions (PCRE),
+# if you want to use Perl compatible regular expressions (PCRE) or libtre for
+# unlimited fuzzy searching, uncomment this and set the value to pcre or tre
 # also have a look at INSTALL for further notes on this
 
-#HAVE_PCREPOSIX=1
-
-# uncomment this if you want to use libtre for unlimited fuzzy searching,
-# also have a look at INSTALL for further notes on this
-
-#HAVE_LIBTRE=1
+#REGEXLIB = pcre
 
 # uncomment this to enable support for the pin plugin.
 
@@ -76,10 +72,9 @@ TMPDIR = /tmp
 ### auto configuring modules
 ifdef AUTOCONFIG
 	ifeq (exists, $(shell pkg-config libpcre && echo exists))
-		HAVE_PCREPOSIX = 1
-	endif
-	ifeq (exists, $(shell pkg-config tre && echo exists))
-		HAVE_LIBTRE = 1
+		REGEXLIB = pcre
+	else ifeq (exists, $(shell pkg-config tre && echo exists))
+		REGEXLIB = tre
 	endif
 	ifeq (exists, $(shell test -e ../pin && echo exists))
 		USE_PINPLUGIN = 1
@@ -136,14 +131,12 @@ DEFINES4 += $(EPGSEARCH_DEFINES) -DPLUGI
 
 OBJS = afuzzy.o blacklist.o changrp.o confdloader.o conflictcheck.o conflictcheck_thread.o distance.o $(PLUGIN).o epgsearchcats.o epgsearchcfg.o epgsearchext.o epgsearchsetup.o  epgsearchsvdrp.o epgsearchtools.o i18n.o mail.o md5.o menu_announcelist.o menu_blacklistedit.o menu_blacklists.o menu_commands.o menu_conflictcheck.o menu_deftimercheckmethod.o menu_dirselect.o menu_event.o menu_favorites.o menu_main.o menu_myedittimer.o menu_quicksearch.o menu_recsdone.o menu_search.o menu_searchactions.o menu_searchedit.o menu_searchresults.o menu_searchtemplate.o menu_switchtimers.o menu_templateedit.o menu_timersdone.o menu_whatson.o noannounce.o pending_notifications.o rcfile.o  recdone.o recstatus.o searchtimer_thread.o services.o switchtimer.o switchtimer_thread.o templatefile.o timer_thread.o timerdone.o timerstatus.o uservars.o varparser.o  
 
-ifdef HAVE_PCREPOSIX
+ifeq ($(REGEXLIB), pcre)
 LIBS += $(shell pcre-config --libs-posix)
 #LIBS += -L/usr/lib -lpcreposix -lpcre
 INCLUDE += $(shell pcre-config --cflags)
 DEFINES += -DHAVE_PCREPOSIX
-endif
-
-ifdef HAVE_LIBTRE
+else ifeq ($(REGEXLIB), tre)
 LIBS += -L$(shell pkg-config --variable=libdir tre) $(shell pkg-config --libs tre)
 #LIBS += -L/usr/lib -ltre
 DEFINES += -DHAVE_LIBTRE


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-epgsearch/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Aug 2009 08:24:04 -0000	1.2
+++ .cvsignore	15 Oct 2009 18:08:06 -0000	1.3
@@ -1 +1 @@
-vdr-epgsearch-0.9.25.beta14.tgz
+vdr-epgsearch-0.9.25.beta15.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-epgsearch/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Aug 2009 08:24:04 -0000	1.2
+++ sources	15 Oct 2009 18:08:07 -0000	1.3
@@ -1 +1 @@
-ea83d6066cb0ffd67b1896aca58d5dc8  vdr-epgsearch-0.9.25.beta14.tgz
+963cad9227241e59576a0d1fd012ed67  vdr-epgsearch-0.9.25.beta15.tgz


Index: vdr-epgsearch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-epgsearch/devel/vdr-epgsearch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vdr-epgsearch.spec	11 Aug 2009 08:24:05 -0000	1.1
+++ vdr-epgsearch.spec	15 Oct 2009 18:08:07 -0000	1.2
@@ -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      beta14
+%global beta      beta15
 
 Name:           vdr-%{pname}
 Version:        0.9.25
@@ -13,29 +13,22 @@ Summary:        Powerful schedules menu 
 
 Group:          Applications/Multimedia
 License:        GPLv2+
-URL:            http://winni.vdr-developer.org/epgsearch/
+URL:            http://winni.vdr-developer.org/epgsearch/index_eng.html
 Source0:        http://winni.vdr-developer.org/epgsearch/downloads/beta/%{name}-%{version}.%{beta}.tgz
 Source1:        %{name}.conf
 Source2:        %{name}-epgsearchonly.conf
 Source3:        %{name}-conflictcheckonly.conf
 Source4:        %{name}-quickepgsearch.conf
 # Fedora specific, no need to send upstream
-Patch0:         %{name}-0.9.25.beta14-fedora.patch
-# http://www.vdr-developer.org/mantisbt/view.php?id=540
-Patch1:         %{name}-0.9.25.beta14-sendmail.patch
-# http://www.vdr-developer.org/mantisbt/view.php?id=541
-Patch2:         %{name}-0.9.25.beta14-regexinc.patch
+Patch0:         %{name}-0.9.25.beta15-fedora.patch
 # http://www.vdr-developer.org/mantisbt/view.php?id=543
-Patch3:         %{name}-0.9.25.beta14-regexlib.patch
-# http://www.vdr-developer.org/mantisbt/view.php?id=539
-Patch4:         %{name}-0.9.25.beta14-mansect.patch
-# http://www.vdr-developer.org/mantisbt/view.php?id=542
-Patch5:         %{name}-0.9.25.beta14-finnish.patch
+Patch1:         %{name}-0.9.25.beta15-regexlib.patch
+# http://www.vdr-developer.org/mantisbt/view.php?id=551
+Patch2:         %{name}-0.9.25.beta15-finnish.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  vdr-devel
 BuildRequires:  gettext
-BuildRequires:  /usr/bin/pod2man
 Requires:       vdr(abi)%{?_isa} = %{apiver}
 
 %description
@@ -47,12 +40,10 @@ reusable queries which can be used as dy
 
 %prep
 %setup -q -n %{pname}-%{version}.%{beta}
+find . -name "*~" -delete # unclean 0.9.25.beta15 tarball
 sed -e 's|__VARDIR__|%{vardir}|g' %{PATCH0} | %{__patch} --fuzz=0
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -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
@@ -64,7 +55,6 @@ chmod -x scripts/*
 %build
 make %{?_smp_mflags} AUTOCONFIG= LIBDIR=. LOCALEDIR=./locale \
     VDRDIR=%{_libdir}/vdr all
-./docsrc2man.sh
 
 
 %install
@@ -115,7 +105,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Aug  3 2009 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.9.25-0.3.beta14
+* Thu Oct 15 2009 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.9.25-0.3.beta15
+- Update to 0.9.25.beta15.
+- Sendmail, regex includes and man section patches applied upstream.
+- Point URL to English version of the project home page.
+
+* Mon Aug  3 2009 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.9.25-0.3.beta14
 - Move many files that are not config ones but more like state data edited
   through the OSD from /etc to /var.
 - Patch to use sendmail for sending mail by default.
@@ -123,7 +118,7 @@ rm -rf $RPM_BUILD_ROOT
 - Include sample config files in docs.
 - Own config dir structure.
 
-* Sun Jul 19 2009 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.9.25-0.2.beta14
+* Sun Jul 19 2009 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.9.25-0.2.beta14
 - Revert to using system regex, building with more than one regexp
   implementation makes no sense and pcre and tre seem to have more issues.
   Also patch to make builds with both pcre and tre less likely to happen.
@@ -132,7 +127,7 @@ rm -rf $RPM_BUILD_ROOT
 - Patch to fix embedded man page sections for non-section 5 man pages.
 - Patch to improve some Finnish translations.
 
-* Wed Jul 15 2009 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.9.25-0.1.beta14
+* Wed Jul 15 2009 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.9.25-0.1.beta14
 - Update to 0.9.25.beta14; gcc 4.3 patch no longer needed.
 - Build with PCRE and TRE support.
 - Use %%global instead of %%define.
@@ -149,22 +144,22 @@ rm -rf $RPM_BUILD_ROOT
 - Handle VDR 1.6 style i18n
 - Update license
 
-* Wed Sep  5 2007 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.9.23-0.1
+* Wed Sep  5 2007 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.9.23-0.1
 - 0.9.23.
 - License: GPL+
 
-* Sun May 27 2007 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.9.22-0.1
+* Sun May 27 2007 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.9.22-0.1
 - 0.9.22.
 
-* Sun Apr 29 2007 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.9.21-0.1
+* Sun Apr 29 2007 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.9.21-0.1
 - 0.9.21.
 - Include extra scripts in docs.
 
-* Tue Jan 30 2007 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.9.20-0.1
+* Tue Jan 30 2007 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.9.20-0.1
 - 0.9.20.
 
-* Sun Jan  7 2007 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.9.19-0.2
+* Sun Jan  7 2007 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.9.19-0.2
 - Rebuild for VDR 1.4.5.
 
-* Sun Nov 19 2006 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.9.19-0.1
+* Sun Nov 19 2006 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.9.19-0.1
 - First build.


--- vdr-epgsearch-0.9.25.beta14-fedora.patch DELETED ---


--- vdr-epgsearch-0.9.25.beta14-finnish.patch DELETED ---


--- vdr-epgsearch-0.9.25.beta14-mansect.patch DELETED ---


--- vdr-epgsearch-0.9.25.beta14-regexinc.patch DELETED ---


--- vdr-epgsearch-0.9.25.beta14-regexlib.patch DELETED ---


--- vdr-epgsearch-0.9.25.beta14-sendmail.patch DELETED ---


