rpms/crm114/devel crm114-rpm.patch,1.6,1.7 crm114.spec,1.13,1.14

[Dominik Mierzejewski]

Author: rathann

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

Modified Files:
	crm114-rpm.patch crm114.spec 
Log Message:
Allow specifying full path for shuffle.crm.


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

Index: crm114-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/crm114/devel/crm114-rpm.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- crm114-rpm.patch	19 Jun 2010 17:35:37 -0000	1.6
+++ crm114-rpm.patch	19 Jun 2010 17:52:10 -0000	1.7
@@ -1,18 +1,6 @@
-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
++++ 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
@@ -22,9 +10,18 @@ diff -up crm114-20090807-BlameThorstenAn
  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	2010-06-19 19:22:32.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.
  #


Index: crm114.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crm114/devel/crm114.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- crm114.spec	19 Jun 2010 17:35:37 -0000	1.13
+++ crm114.spec	19 Jun 2010 17:52:10 -0000	1.14
@@ -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
@@ -65,6 +65,7 @@ make megatest
 %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
+  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 <rpm at greysector.net> 0-1.12.20090807