diff --git a/.cvsignore b/.cvsignore index bbab9b3..4b8cca9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vdr-epgsearch-0.9.25.beta15.tgz +vdr-epgsearch-0.9.25.beta16.tgz diff --git a/sources b/sources index aa6f681..7a389ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -963cad9227241e59576a0d1fd012ed67 vdr-epgsearch-0.9.25.beta15.tgz +e42d372dd8b0e07de9d367da6e3c7ce9 vdr-epgsearch-0.9.25.beta16.tgz diff --git a/vdr-epgsearch-0.9.25.beta15-finnish.patch b/vdr-epgsearch-0.9.25.beta15-finnish.patch deleted file mode 100644 index c0f3981..0000000 --- a/vdr-epgsearch-0.9.25.beta15-finnish.patch +++ /dev/null @@ -1,69 +0,0 @@ -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: \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ä \n" - "Language-Team: \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" -+ diff --git a/vdr-epgsearch-0.9.25.beta15-regexlib.patch b/vdr-epgsearch-0.9.25.beta15-regexlib.patch deleted file mode 100644 index e8fd432..0000000 --- a/vdr-epgsearch-0.9.25.beta15-regexlib.patch +++ /dev/null @@ -1,120 +0,0 @@ -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 '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 diff --git a/vdr-epgsearch.spec b/vdr-epgsearch.spec index 2d0d51d..0a60142 100644 --- a/vdr-epgsearch.spec +++ b/vdr-epgsearch.spec @@ -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 beta15 +%global beta beta16 Name: vdr-%{pname} Version: 0.9.25 @@ -21,10 +21,6 @@ Source3: %{name}-conflictcheckonly.conf 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=543 -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 @@ -32,7 +28,7 @@ BuildRequires: gettext Requires: vdr(abi)%{?_isa} = %{apiver} %description -This plugin provides a powerful a replacement for VDR's default +This plugin provides a powerful replacement for VDR's default schedules menu entry. It looks like the standard schedules menu, but adds several functions, such as additional commands for EPG entries, reusable queries which can be used as dynamic "search timers" etc. @@ -40,10 +36,8 @@ reusable queries which can be used as dynamic "search timers" etc. %prep %setup -q -n %{pname}-%{version}.%{beta} -find . -name "*~" -delete # unclean 0.9.25.beta15 tarball +find . -name "*~" -delete # unclean 0.9.25.beta16 tarball sed -e 's|__VARDIR__|%{vardir}|g' %{PATCH0} | %{__patch} --fuzz=0 -%patch1 -p1 -%patch2 -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 @@ -105,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 1 2010 Ville Skyttä - 0.9.25-0.3.beta16 +- Update to 0.9.25.beta16; regexlib and Finnish patches applied upstream. + * Thu Oct 15 2009 Ville Skyttä - 0.9.25-0.3.beta15 - Update to 0.9.25.beta15. - Sendmail, regex includes and man section patches applied upstream.