rpms/crm114/F-13 crm114-rpm.patch,1.5,1.6 crm114.spec,1.12,1.13
Dominik Mierzejewski
rathann at fedoraproject.org
Sat Jun 19 17:53:54 UTC 2010
Author: rathann
Update of /cvs/pkgs/rpms/crm114/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16949
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
and to allow specifying full path for shuffle.crm
- add full path to shuffle.crm in example mailfilter.cf
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/F-13/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:53:53 -0000 1.6
@@ -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.
#
Index: crm114.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crm114/F-13/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:53:53 -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
@@ -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 <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
- included missing shuffle.crm (rhbz#520397)
- rebuilt against new tre
More information about the scm-commits
mailing list