From 64f8dbb6a5172413ba79e4b8ece9ef01be0a839e Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <rathann@fedoraproject.org>
Date: Jul 06 2010 21:48:37 +0000
Subject: Backport latest F-12 update:

Sat Jun 19 2010 Dominik Mierzejewski <rpm@greysector.net> 0-1.12.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
- included missing shuffle.crm (rhbz#520397)
- improved Summary:

---

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:) <default> //
++isolate (:fileprefix:) <default> /:*:_env_HOME:\/.crm114\//
+ isolate (:spamcss:) <default> /spam.css/
+ isolate (:goodcss:) <default> /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 0626975..ac98828 100644
--- a/crm114.spec
+++ b/crm114.spec
@@ -1,10 +1,10 @@
 %define cvsver 20090807
 %define codename BlameThorstenAndJenny
 
-Summary: CRM114 Bayesian Spam Detector
+Summary: Controllable Regex Mutilator: multi-method content classifier and filter
 Name: crm114
 Version: 0
-Release: 1.11.%{cvsver}%{?dist}
+Release: 1.12.%{cvsver}%{?dist}
 URL: http://crm114.sourceforge.net/
 License: GPLv3
 Group: Applications/Text
@@ -44,7 +44,7 @@ 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 755 mail{filter,reaver,trainer}.crm shuffle.crm $RPM_BUILD_ROOT%{_datadir}/%{name}/
 install -pm 644 maillib.crm $RPM_BUILD_ROOT%{_datadir}/%{name}/
 
 %check
@@ -61,6 +61,13 @@ make megatest
 %{_datadir}/emacs/site-lisp/*.el
 
 %changelog
+* Sat Jun 19 2010 Dominik Mierzejewski <rpm@greysector.net> 0-1.12.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
+- included missing shuffle.crm (rhbz#520397)
+- improved Summary:
+
 * Sun Aug 23 2009 Dominik Mierzejewski <rpm@greysector.net> 0-1.11.20090807
 - updated to 20090807 "BlameThorstenAndJenny"
 - dropped upstreamed patch hunks, rebased patch