rpms/crm114/devel crm114-rpm.patch,1.5,1.6 crm114.spec,1.12,1.13

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/pkgs/rpms/crm114/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15323

Modified Files:
	crm114-rpm.patch crm114.spec 
Log Message:
* Sat Jun 19 2010 Dominik Mierzejewski <rpm at greysector.net> 0-1.13.20090807
- patch mailtrainer.crm to look for mailfilter.cf in $HOME/.crm114 by default
- add full path to shuffle.crm in example mailfilter.cf


crm114-rpm.patch:
 Makefile        |   28 ++++++++++++++--------------
 mailfilter.cf   |    2 +-
 mailtrainer.crm |    2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

Index: crm114-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/crm114/devel/crm114-rpm.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- crm114-rpm.patch	23 Aug 2009 16:13:07 -0000	1.5
+++ crm114-rpm.patch	19 Jun 2010 17:35:37 -0000	1.6
@@ -1,6 +1,30 @@
+diff -up crm114-20090807-BlameThorstenAndJenny.src/mailfilter.cf.r crm114-20090807-BlameThorstenAndJenny.src/mailfilter.cf
+--- crm114-20090807-BlameThorstenAndJenny.src/mailfilter.cf.r	2009-08-07 17:22:37.000000000 +0200
++++ crm114-20090807-BlameThorstenAndJenny.src/mailfilter.cf	2010-06-19 19:29:59.000000000 +0200
+@@ -260,7 +260,7 @@
+ #            ------  options to shuffle.crm will work fine.  Alternatively,
+ #             ------  you can use the "sort --key 1.2" on date-named files to
+ #              -----   achieve chronological training
+-:trainer_randomizer_command: /.\/shuffle.crm/
++:trainer_randomizer_command: /\/usr\/share\/crm114\/shuffle.crm/
+ #:trainer_randomizer_command: /.\/crm114 shuffle.crm/
+ #:trainer_randomizer_command: /sort --key 1.2/
+ 
+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:20:31.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:) <default> //
++isolate (:fileprefix:) <default> /:*:_env_HOME:\/.crm114\//
+ isolate (:spamcss:) <default> /spam.css/
+ isolate (:goodcss:) <default> /nonspam.css/
+ #
 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:22:32.000000000 +0200
 @@ -98,7 +98,7 @@ CFLAGS += -DVERSION='"$(VERSION)"'
  #  really picayune stuff.
  #


Index: crm114.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crm114/devel/crm114.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- crm114.spec	6 Dec 2009 13:49:09 -0000	1.12
+++ crm114.spec	19 Jun 2010 17:35:37 -0000	1.13
@@ -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
@@ -63,6 +63,10 @@ make megatest
 %{_datadir}/emacs/site-lisp/*.el
 
 %changelog
+* Sat Jun 19 2010 Dominik Mierzejewski <rpm at greysector.net> 0-1.13.20090807
+- patch mailtrainer.crm to look for mailfilter.cf in $HOME/.crm114 by default
+- add full path to shuffle.crm in example mailfilter.cf
+
 * Sun Sep 20 2009 Dominik Mierzejewski <rpm at greysector.net> 0-1.12.20090807
 - included missing shuffle.crm (rhbz#520397)
 - rebuilt against new tre