diff --git a/crm114-rpm.patch b/crm114-rpm.patch index 21b1658..bb26de5 100644 --- a/crm114-rpm.patch +++ b/crm114-rpm.patch @@ -1,6 +1,27 @@ +diff -up crm114-20090807-BlameThorstenAndJenny.src/mailtrainer.crm.r crm114-20090807-BlameThorstenAndJenny.src/mailtrainer.crm +--- crm114-20090807-BlameThorstenAndJenny.src/mailtrainer.crm.r 2009-08-07 17:22:37.000000000 +0200 ++++ crm114-20090807-BlameThorstenAndJenny.src/mailtrainer.crm 2010-06-19 19:47:15.000000000 +0200 +@@ -90,7 +90,7 @@ isolate (:log_rejections:) // + # + # this ISOLATE will guarantee that :fileprefix: exists, and keep it's + # prior (commandline) value if it does, and an empty string if it doesnt +-isolate (:fileprefix:) // ++isolate (:fileprefix:) /:*:_env_HOME:\/.crm114\// + isolate (:spamcss:) /spam.css/ + isolate (:goodcss:) /nonspam.css/ + # +@@ -384,7 +384,7 @@ alter (:report:) /:*:report: concise lo + # output / Full set of files, before sort-randomization: \n:*:randfiles:\n/ + # now randomize the files. NOTE that this requires a shuffler + # command somewhere. +- syscall (:*:randfiles:) (:randfiles:) /:*:fileprefix::*:trainer_randomizer_command: / ++ syscall (:*:randfiles:) (:randfiles:) /:*:trainer_randomizer_command: / + # output /\n Full set of files, after randomize: \n:*:randfiles:\n/ + + } diff -up crm114-20090807-BlameThorstenAndJenny.src/Makefile.r crm114-20090807-BlameThorstenAndJenny.src/Makefile --- crm114-20090807-BlameThorstenAndJenny.src/Makefile.r 2009-08-07 17:22:37.000000000 +0200 -+++ crm114-20090807-BlameThorstenAndJenny.src/Makefile 2009-08-23 17:31:00.000000000 +0200 ++++ crm114-20090807-BlameThorstenAndJenny.src/Makefile 2010-06-19 19:35:10.000000000 +0200 @@ -98,7 +98,7 @@ CFLAGS += -DVERSION='"$(VERSION)"' # really picayune stuff. # diff --git a/crm114.spec b/crm114.spec index 35dace3..bc185cd 100644 --- a/crm114.spec +++ b/crm114.spec @@ -4,7 +4,7 @@ Summary: Controllable Regex Mutilator: multi-method content classifier and filter Name: crm114 Version: 0 -Release: 1.12.%{cvsver}%{?dist} +Release: 1.13.%{cvsver}%{?dist} URL: http://crm114.sourceforge.net/ License: GPLv3 Group: Applications/Text @@ -46,8 +46,8 @@ rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/{%{name},emacs/site-lisp}} make DESTDIR=$RPM_BUILD_ROOT INSTALLFLAGS="-m 755 -p" install -install -pm 755 mail{filter,reaver,trainer}.crm $RPM_BUILD_ROOT%{_datadir}/%{name}/ -install -pm 644 maillib.crm shuffle.crm $RPM_BUILD_ROOT%{_datadir}/%{name}/ +install -pm 755 mail{filter,reaver,trainer}.crm shuffle.crm $RPM_BUILD_ROOT%{_datadir}/%{name}/ +install -pm 644 maillib.crm $RPM_BUILD_ROOT%{_datadir}/%{name}/ %check make megatest @@ -63,6 +63,11 @@ make megatest %{_datadir}/emacs/site-lisp/*.el %changelog +* Sat Jun 19 2010 Dominik Mierzejewski 0-1.13.20090807 +- patch mailtrainer.crm to look for mailfilter.cf in $HOME/.crm114 by default + and to allow specifying full path for shuffle.crm +- add full path to shuffle.crm in example mailfilter.cf + * Sun Sep 20 2009 Dominik Mierzejewski 0-1.12.20090807 - included missing shuffle.crm (rhbz#520397) - rebuilt against new tre