From 02fb02455339d68c6b2d9873628be223c085a647 Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Oct 15 2009 18:08:07 +0000 Subject: - 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. --- diff --git a/.cvsignore b/.cvsignore index 0a32bb0..bbab9b3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vdr-epgsearch-0.9.25.beta14.tgz +vdr-epgsearch-0.9.25.beta15.tgz diff --git a/sources b/sources index 48add0a..aa6f681 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ea83d6066cb0ffd67b1896aca58d5dc8 vdr-epgsearch-0.9.25.beta14.tgz +963cad9227241e59576a0d1fd012ed67 vdr-epgsearch-0.9.25.beta15.tgz diff --git a/vdr-epgsearch-0.9.25.beta14-fedora.patch b/vdr-epgsearch-0.9.25.beta14-fedora.patch deleted file mode 100644 index 36e0eec..0000000 --- a/vdr-epgsearch-0.9.25.beta14-fedora.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff -up epgsearch-0.9.25.beta14/docsrc2man.sh~ epgsearch-0.9.25.beta14/docsrc2man.sh ---- epgsearch-0.9.25.beta14/docsrc2man.sh~ 2009-01-06 21:15:50.000000000 +0200 -+++ epgsearch-0.9.25.beta14/docsrc2man.sh 2009-08-03 22:30:23.000000000 +0300 -@@ -35,10 +35,11 @@ for LANGUAGE in $(ls "$DOCSRC"/); do - done - - rm "$DOCSRC"/$LANGUAGE/*~ 2>/dev/null -- gzip -f man/$LANGUAGE/*.[0-9] - - done - -+exit 0 -+ - echo - - for LANGUAGE in $(ls "$DOCSRC"/); do -diff -up epgsearch-0.9.25.beta14/epgsearch.c~ epgsearch-0.9.25.beta14/epgsearch.c ---- epgsearch-0.9.25.beta14/epgsearch.c~ 2009-06-14 12:39:46.000000000 +0300 -+++ epgsearch-0.9.25.beta14/epgsearch.c 2009-08-03 22:44:58.000000000 +0300 -@@ -82,7 +82,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) - { -@@ -444,15 +444,15 @@ 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")); -+ 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"); - - cSearchTimerThread::Init(this); - cSwitchTimerThread::Init(); -diff -up epgsearch-0.9.25.beta14/epgsearchcfg.c~ epgsearch-0.9.25.beta14/epgsearchcfg.c ---- epgsearch-0.9.25.beta14/epgsearchcfg.c~ 2009-01-29 19:51:53.000000000 +0200 -+++ epgsearch-0.9.25.beta14/epgsearchcfg.c 2009-08-03 22:30:32.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; -diff -up epgsearch-0.9.25.beta14/Makefile~ epgsearch-0.9.25.beta14/Makefile ---- epgsearch-0.9.25.beta14/Makefile~ 2009-06-14 16:03:59.000000000 +0300 -+++ epgsearch-0.9.25.beta14/Makefile 2009-08-03 22:30:23.000000000 +0300 -@@ -268,11 +268,11 @@ install-doc: - @mkdir -p $(MANDIR)/de/man1 - @mkdir -p $(MANDIR)/de/man5 - -- @cp man/en/*1.gz $(MANDIR)/man1/ -- @cp man/en/*4.gz $(MANDIR)/man4/ -- @cp man/en/*5.gz $(MANDIR)/man5/ -- @cp man/de/*1.gz $(MANDIR)/de/man1/ -- @cp man/de/*5.gz $(MANDIR)/de/man5/ -+ @cp man/en/*1 $(MANDIR)/man1/ -+ @cp man/en/*4 $(MANDIR)/man4/ -+ @cp man/en/*5 $(MANDIR)/man5/ -+ @cp man/de/*1 $(MANDIR)/de/man1/ -+ @cp man/de/*5 $(MANDIR)/de/man5/ - clean: - @-rm -f $(PODIR)/*.mo $(PODIR)/*.pot $(PODIR)/*~ - @-rm -f $(OBJS) $(OBJS2) $(OBJS3) $(OBJS4) $(DEPFILE) *.so *.tgz core* *~ createcats createcats.o pod2*.tmp diff --git a/vdr-epgsearch-0.9.25.beta14-finnish.patch b/vdr-epgsearch-0.9.25.beta14-finnish.patch deleted file mode 100644 index bfcb065..0000000 --- a/vdr-epgsearch-0.9.25.beta14-finnish.patch +++ /dev/null @@ -1,167 +0,0 @@ -From 52c1027bbc2b1c3c2a9f435d7558065110e7b7a9 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Ville=20Skytt=C3=A4?= -Date: Sun, 19 Jul 2009 23:31:28 +0300 -Subject: [PATCH] Finnish translation improvements. - ---- - po/fi_FI.po | 41 ++++++++++++++++++++--------------------- - 1 files changed, 20 insertions(+), 21 deletions(-) - -diff --git a/po/fi_FI.po b/po/fi_FI.po -index a0799c2..4c7e21e 100644 ---- a/po/fi_FI.po -+++ b/po/fi_FI.po -@@ -11,9 +11,9 @@ msgstr "" - "Project-Id-Version: VDR 1.5.7\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2009-04-09 19:51+0200\n" --"PO-Revision-Date: 2007-08-14 20:21+0200\n" --"Last-Translator: Rolf Ahrenberg \n" --"Language-Team: \n" -+"PO-Revision-Date: 2009-07-19 23:22+0200\n" -+"Last-Translator: Ville Skyttä \n" -+"Language-Team: \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -@@ -167,14 +167,14 @@ msgid "Help$Choose between 'Overview - Now' and 'Schedule' as start menu when th - msgstr "Valitsee oletusnäytöksi joko tämänhetkisen yleiskatsauksen tai valitun kanavan ohjelmiston." - - msgid "Ok key" --msgstr "'OK' näppäin" -+msgstr "OK-näppäin" - - msgid "" - "Help$Choose here the behaviour of key 'Ok'. You can use it to display the summary or to switch to the corresponding channel.\n" - "Note: the functionality of key 'blue' (Switch/Info/Search) depends on this setting." - msgstr "" --"Valitse toiminto 'OK' näppäimelle: näytä ohjelman tiedot tai vaihda kyseiselle kanavalle.\n" --"Huomioi: sinisen näppäimen toiminto (Vaihda/Tiedot/Hae) riippuu tästä asetuksesta" -+"Valitse toiminto OK-näppäimelle: näytä ohjelman tiedot tai vaihda kyseiselle kanavalle.\n" -+"Huomioi: sinisen näppäimen toiminto (Vaihda/Tiedot/Hae) riippuu tästä asetuksesta." - - msgid "Red key" - msgstr "Punainen näppäin" -@@ -184,7 +184,7 @@ msgid "" - "(Can be toggled with key '0')" - msgstr "" - "Valitsee oletustoiminnon ('Tallenna' tai 'Komennot') punaiselle näppäimelle.\n" --"Punaisen näppäimen toimintoa voidaan vaihtaa myös lennossa painamalla '0' näppäintä." -+"Punaisen näppäimen toimintoa voidaan vaihtaa myös lennossa painamalla näppäintä 0." - - msgid "Blue key" - msgstr "Sininen näppäin" -@@ -194,7 +194,7 @@ msgid "" - "(Can be toggled with key '0')" - msgstr "" - "Valitsee oletustoiminnon ('Valitse' tai 'Etsi') siniselle näppäimelle.\n" --"Sinisen näppäimen toimintoa voidaan vaihtaa myös lennossa painamalla '0' näppäintä." -+"Sinisen näppäimen toimintoa voidaan vaihtaa myös lennossa painamalla näppäintä 0." - - msgid "Show progress in 'Now'" - msgstr "Näytä aikajana 'Nyt'-sivulla" -@@ -214,7 +214,7 @@ msgid "" - "\n" - "(To completely define your own menu look please inspect the MANUAL)" - msgstr "" --"Näyttää kanavien numeroinnin tämänhetkisessä yleiskatsaksessa.\n" -+"Näyttää kanavien numeroinnin tämänhetkisessä yleiskatsauksessa.\n" - "\n" - "Lisätietoja valikon muokkauksesta löytyy MANUAL-tiedostosta." - -@@ -222,7 +222,7 @@ msgid "Show channel separators" - msgstr "Näytä kanavaerottimet" - - msgid "Help$Display VDR channel groups as separators between your channels in 'Overview - Now'." --msgstr "Näyttää erottimet yleiskatsauksessa kanavaville." -+msgstr "Näyttää erottimet yleiskatsauksessa kanaville." - - msgid "Show day separators" - msgstr "Näytä päiväerottimet" -@@ -252,7 +252,7 @@ msgid "Show channels without EPG" - msgstr "Näytä ohjelmaoppaattomat kanavat" - - msgid "Help$Choose 'yes' here if you want to display channels without EPG in 'Overview - Now'. 'Ok' on these entries switches the channel." --msgstr "Näyttää tämänhetkisessä yleiskatsauksessa myöskin kanavat, joilta ei löydy ohjelmatietoja. Voit vaihtaa tälläiselle kanavalle 'OK' näppäimellä." -+msgstr "Näyttää tämänhetkisessä yleiskatsauksessa myöskin kanavat, joilta ei löydy ohjelmatietoja. Voit vaihtaa tällaiselle kanavalle OK-näppäimellä." - - msgid "Time interval for FRew/FFwd [min]" - msgstr "Oletusaikasiirtymä [min]" -@@ -264,13 +264,13 @@ msgid "" - msgstr "" - "Valitsee ohjelmaoppaan oletusaikasiirtymän pikakelausnäppäimille.\n" - "\n" --"Jos sinulla ei ole kyseisiä näppäimiä käytössäsi, voit asettaa kyseiset toiminnot vihreälle ja keltaiselle näppäimelle painamalla '0' näppäintä." -+"Jos sinulla ei ole kyseisiä näppäimiä käytössäsi, voit asettaa kyseiset toiminnot vihreälle ja keltaiselle näppäimelle painamalla näppäintä 0." - - msgid "Toggle Green/Yellow" - msgstr "Käytä aikasiirtymää värinäppäimillä" - - msgid "Help$Specify if green and yellow shall also be switched when pressing '0'." --msgstr "Määrittelee vaihdetaanko vihreän ja keltaisen näppäimen toimintoja painamalla '0' näppäintä." -+msgstr "Määrittelee vaihdetaanko vihreän ja keltaisen näppäimen toimintoja painamalla näppäintä 0." - - msgid "Show favorites menu" - msgstr "Näytä suosikkivalikko" -@@ -321,7 +321,7 @@ msgstr "" - "- hakemiston määritys\n" - "- vapaasti määriteltävät viikonpäivät toistuville ajastimille\n" - "- jakson nimen täydennys\n" --"- erilaisten EPG-muuttujien tuki (kts. MANUAL-tiedostosta)" -+"- erilaisten EPG-muuttujien tuki (ks. MANUAL-tiedostosta)" - - msgid "Default recording dir" - msgstr "Oletushakemisto tallenteille" -@@ -545,13 +545,13 @@ msgid "Auth user" - msgstr "SMTP-käyttäjätunnus" - - msgid "Help$Specify the auth user, if this account needs authentication for SMTP." --msgstr "Määrittelee käyttäjätunnuksen, jos SMTP-palvelimelle pitää autentikoida." -+msgstr "Määrittelee käyttäjätunnuksen, jos SMTP-palvelimelle pitää autentikoitua." - - msgid "Auth password" - msgstr "SMTP-salasana" - - msgid "Help$Specify the auth password, if this account needs authentication for SMTP." --msgstr "Määrittelee salasanan, jos SMTP-palvelimelle pitää autentikoida." -+msgstr "Määrittelee salasanan, jos SMTP-palvelimelle pitää autentikoitua." - - msgid "Mail account check failed!" - msgstr "Sähköpostilaatikon tarkistus epäonnistui!" -@@ -1102,16 +1102,16 @@ msgid "less" - msgstr "pienempi" - - msgid "less or equal" --msgstr "pienempi tai yhtäsuuri" -+msgstr "pienempi tai yhtä suuri" - - msgid "greater" - msgstr "suurempi" - - msgid "greater or equal" --msgstr "suurempi tai yhtäsuuri" -+msgstr "suurempi tai yhtä suuri" - - msgid "equal" --msgstr "yhtäsuuri" -+msgstr "yhtä suuri" - - msgid "not equal" - msgstr "erisuuri" -@@ -1150,7 +1150,7 @@ msgid "Edit$Delete template?" - msgstr "Poistetaanko mallipohja?" - - msgid "Overwrite existing entries?" --msgstr "Kirjoitetaanko olemassaolevan päälle?" -+msgstr "Kirjoitetaanko olemassa olevan päälle?" - - msgid "Edit entry" - msgstr "Muokkaa valintaa" -@@ -1217,4 +1217,3 @@ msgstr "%02ldh" - msgid "in %02ldm" - msgstr "%02ldm" - -- --- -1.6.0.6 - diff --git a/vdr-epgsearch-0.9.25.beta14-mansect.patch b/vdr-epgsearch-0.9.25.beta14-mansect.patch deleted file mode 100644 index b974470..0000000 --- a/vdr-epgsearch-0.9.25.beta14-mansect.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up epgsearch-0.9.25.beta14/docsrc2man.sh~ epgsearch-0.9.25.beta14/docsrc2man.sh ---- epgsearch-0.9.25.beta14/docsrc2man.sh~ 2009-01-06 21:15:50.000000000 +0200 -+++ epgsearch-0.9.25.beta14/docsrc2man.sh 2009-07-18 23:53:19.000000000 +0300 -@@ -26,7 +26,9 @@ for LANGUAGE in $(ls "$DOCSRC"/); do - - for i in "$DOCSRC"/$LANGUAGE/*.txt; do - echo -ne "create man page: ($LANGUAGE) $(basename "$i" ".txt")..." -- pod2man -c "Epgsearch Version $VERSION" -n "$(echo "$(basename "$i")" | sed -e 's/\.[0-9]\..*$//')" --section=5 "$i" >"man/$LANGUAGE/$(basename "$i" ".txt")" -+ name=$(echo "$(basename "$i")" | sed -e 's/\.[0-9]\..*$//') -+ sect=$(echo "$i" | sed -e 's/.*\.\([0-9]\)\.txt/\1/') -+ pod2man -c "Epgsearch Version $VERSION" -n "$name" --section="$sect" "$i" >"man/$LANGUAGE/$(basename "$i" ".txt")" - if [ $? -eq 0 ]; then - echo " done." - else diff --git a/vdr-epgsearch-0.9.25.beta14-regexinc.patch b/vdr-epgsearch-0.9.25.beta14-regexinc.patch deleted file mode 100644 index 48e09b3..0000000 --- a/vdr-epgsearch-0.9.25.beta14-regexinc.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -up epgsearch-0.9.25.beta14/blacklist.c~ epgsearch-0.9.25.beta14/blacklist.c ---- epgsearch-0.9.25.beta14/blacklist.c~ 2009-01-29 19:51:53.000000000 +0200 -+++ epgsearch-0.9.25.beta14/blacklist.c 2009-07-18 23:18:59.000000000 +0300 -@@ -32,11 +32,6 @@ The project's page is at http://winni.vd - #include "menu_searchedit.h" - #include "menu_searchresults.h" - #include --#ifdef HAVE_PCREPOSIX --#include --#else --#include --#endif - - cBlacklists Blacklists; - -diff -up epgsearch-0.9.25.beta14/epgsearchext.c~ epgsearch-0.9.25.beta14/epgsearchext.c ---- epgsearch-0.9.25.beta14/epgsearchext.c~ 2009-06-23 21:10:54.000000000 +0300 -+++ epgsearch-0.9.25.beta14/epgsearchext.c 2009-07-18 23:17:29.000000000 +0300 -@@ -38,11 +38,6 @@ The project's page is at http://winni.vd - #include "uservars.h" - #include "blacklist.h" - #include --#ifdef HAVE_PCREPOSIX --#include --#else --#include --#endif - - cSearchExts SearchExts; - cSearchExts SearchTemplates; -diff -up epgsearch-0.9.25.beta14/epgsearchtools.c~ epgsearch-0.9.25.beta14/epgsearchtools.c ---- epgsearch-0.9.25.beta14/epgsearchtools.c~ 2009-07-04 21:29:51.000000000 +0300 -+++ epgsearch-0.9.25.beta14/epgsearchtools.c 2009-07-18 23:18:29.000000000 +0300 -@@ -44,6 +44,8 @@ The project's page is at http://winni.vd - - #ifdef HAVE_PCREPOSIX - #include -+#elif defined(HAVE_LIBTRE) -+#include - #else - #include - #endif -diff -up epgsearch-0.9.25.beta14/Makefile~ epgsearch-0.9.25.beta14/Makefile ---- epgsearch-0.9.25.beta14/Makefile~ 2009-07-19 00:10:52.000000000 +0300 -+++ epgsearch-0.9.25.beta14/Makefile 2009-07-19 00:22:58.000000000 +0300 -@@ -140,6 +140,7 @@ else ifeq ($(USE_REGEXLIB), tre) - LIBS += -L$(shell pkg-config --variable=libdir tre) $(shell pkg-config --libs tre) - #LIBS += -L/usr/lib -ltre - DEFINES += -DHAVE_LIBTRE -+INCLUDE += $(shell pkg-config --cflags tre) - endif - - ifdef USE_PINPLUGIN diff --git a/vdr-epgsearch-0.9.25.beta14-regexlib.patch b/vdr-epgsearch-0.9.25.beta14-regexlib.patch deleted file mode 100644 index 4185201..0000000 --- a/vdr-epgsearch-0.9.25.beta14-regexlib.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -up epgsearch-0.9.25.beta14/doc-src/en/epgsearch.1.txt~ epgsearch-0.9.25.beta14/doc-src/en/epgsearch.1.txt ---- epgsearch-0.9.25.beta14/doc-src/en/epgsearch.1.txt~ 2009-01-29 19:59:10.000000000 +0200 -+++ epgsearch-0.9.25.beta14/doc-src/en/epgsearch.1.txt 2009-07-18 23:22:23.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.beta14/INSTALL~ epgsearch-0.9.25.beta14/INSTALL ---- epgsearch-0.9.25.beta14/INSTALL~ 2009-01-06 21:15:59.000000000 +0200 -+++ epgsearch-0.9.25.beta14/INSTALL 2009-07-18 23:20:39.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.beta14/INSTALL.DE~ epgsearch-0.9.25.beta14/INSTALL.DE ---- epgsearch-0.9.25.beta14/INSTALL.DE~ 2009-01-06 21:16:00.000000000 +0200 -+++ epgsearch-0.9.25.beta14/INSTALL.DE 2009-07-18 23:21:35.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.beta14/Makefile~ epgsearch-0.9.25.beta14/Makefile ---- epgsearch-0.9.25.beta14/Makefile~ 2009-06-14 16:03:59.000000000 +0300 -+++ epgsearch-0.9.25.beta14/Makefile 2009-07-18 23:35:17.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. - -@@ -72,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 -@@ -128,14 +131,12 @@ - - 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 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-0.9.25.beta14-sendmail.patch b/vdr-epgsearch-0.9.25.beta14-sendmail.patch deleted file mode 100644 index c911afa..0000000 --- a/vdr-epgsearch-0.9.25.beta14-sendmail.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -up epgsearch-0.9.25.beta14/mail.c~ epgsearch-0.9.25.beta14/mail.c ---- epgsearch-0.9.25.beta14/mail.c~ 2009-03-23 20:10:43.000000000 +0200 -+++ epgsearch-0.9.25.beta14/mail.c 2009-07-18 23:32:29.000000000 +0300 -@@ -31,6 +31,10 @@ The project's page is at http://winni.vd - #include "epgsearchtools.h" - #include "uservars.h" - -+#ifndef SENDMAIL -+#define SENDMAIL "/usr/sbin/sendmail" -+#endif -+ - extern bool isUTF8; - using namespace std; - -@@ -130,7 +134,7 @@ bool cMailNotifier::SendMailViaSendmail( - { - char mailcmd[256]; - const char* mailargs = "%s -i -FVDR -oem %s"; -- const char* mailproc = "/usr/lib/sendmail"; -+ const char* mailproc = SENDMAIL; - FILE* mail; - - string to = EPGSearchConfig.MailAddressTo; -diff -up epgsearch-0.9.25.beta14/Makefile~ epgsearch-0.9.25.beta14/Makefile ---- epgsearch-0.9.25.beta14/Makefile~ 2009-06-14 16:03:59.000000000 +0300 -+++ epgsearch-0.9.25.beta14/Makefile 2009-07-18 23:35:17.000000000 +0300 -@@ -42,6 +38,10 @@ ifndef AUTOCONFIG - - endif - -+### the sendmail executable to use when epgsearch is configured to use the -+### sendmail method for sending mail -+SENDMAIL = /usr/sbin/sendmail -+ - ### - ### CONFIG END - ### do not edit below this line if you don't know what you do ;-) -@@ -118,11 +117,15 @@ PACKAGE = vdr-$(ARCHIVE) - INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include - #INCLUDES += -I$(VDRDIR)/include - --DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' --DEFINES1 += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(MAINMENUSHORTCUT)"' --DEFINES2 += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN2)"' --DEFINES3 += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN3)"' --DEFINES4 += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN4)"' -+EPGSEARCH_DEFINES += -D_GNU_SOURCE -+ifneq ($(SENDMAIL),) -+EPGSEARCH_DEFINES += -DSENDMAIL='"$(SENDMAIL)"' -+endif -+DEFINES += $(EPGSEARCH_DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -+DEFINES1 += $(EPGSEARCH_DEFINES) -DPLUGIN_NAME_I18N='"$(MAINMENUSHORTCUT)"' -+DEFINES2 += $(EPGSEARCH_DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN2)"' -+DEFINES3 += $(EPGSEARCH_DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN3)"' -+DEFINES4 += $(EPGSEARCH_DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN4)"' - - ### The object files (add further files here): - diff --git a/vdr-epgsearch-0.9.25.beta15-fedora.patch b/vdr-epgsearch-0.9.25.beta15-fedora.patch new file mode 100644 index 0000000..5eb3aaa --- /dev/null +++ b/vdr-epgsearch-0.9.25.beta15-fedora.patch @@ -0,0 +1,51 @@ +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; diff --git a/vdr-epgsearch-0.9.25.beta15-finnish.patch b/vdr-epgsearch-0.9.25.beta15-finnish.patch new file mode 100644 index 0000000..c0f3981 --- /dev/null +++ b/vdr-epgsearch-0.9.25.beta15-finnish.patch @@ -0,0 +1,69 @@ +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 new file mode 100644 index 0000000..e8fd432 --- /dev/null +++ b/vdr-epgsearch-0.9.25.beta15-regexlib.patch @@ -0,0 +1,120 @@ +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 ba97e3f..2d0d51d 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 beta14 +%global beta beta15 Name: vdr-%{pname} Version: 0.9.25 @@ -13,29 +13,22 @@ Summary: Powerful schedules menu replacement plugin for VDR 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 dynamic "search timers" etc. %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ä - 0.9.25-0.3.beta14 +* 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. +- Point URL to English version of the project home page. + +* Mon Aug 3 2009 Ville Skyttä - 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ä - 0.9.25-0.2.beta14 +* Sun Jul 19 2009 Ville Skyttä - 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ä - 0.9.25-0.1.beta14 +* Wed Jul 15 2009 Ville Skyttä - 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ä - 0.9.23-0.1 +* Wed Sep 5 2007 Ville Skyttä - 0.9.23-0.1 - 0.9.23. - License: GPL+ -* Sun May 27 2007 Ville Skyttä - 0.9.22-0.1 +* Sun May 27 2007 Ville Skyttä - 0.9.22-0.1 - 0.9.22. -* Sun Apr 29 2007 Ville Skyttä - 0.9.21-0.1 +* Sun Apr 29 2007 Ville Skyttä - 0.9.21-0.1 - 0.9.21. - Include extra scripts in docs. -* Tue Jan 30 2007 Ville Skyttä - 0.9.20-0.1 +* Tue Jan 30 2007 Ville Skyttä - 0.9.20-0.1 - 0.9.20. -* Sun Jan 7 2007 Ville Skyttä - 0.9.19-0.2 +* Sun Jan 7 2007 Ville Skyttä - 0.9.19-0.2 - Rebuild for VDR 1.4.5. -* Sun Nov 19 2006 Ville Skyttä - 0.9.19-0.1 +* Sun Nov 19 2006 Ville Skyttä - 0.9.19-0.1 - First build.