From 6659111c7fb0530b17323d8249d4fda1a76ab0c6 Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <rathann@fedoraproject.org>
Date: Jun 19 2010 18:26:01 +0000
Subject: - updated to 20100106 "BlameMichelson"


---

diff --git a/.cvsignore b/.cvsignore
index d41f5f8..c4d4774 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-crm114-20090807-BlameThorstenAndJenny.src.tar.gz
+crm114-20100106-BlameMichelson.src.tar.gz
diff --git a/crm114-rpm.patch b/crm114-rpm.patch
index bb26de5..be1d3b1 100644
--- a/crm114-rpm.patch
+++ b/crm114-rpm.patch
@@ -1,6 +1,6 @@
-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
+diff -up crm114-20100106-BlameMichelson.src/mailtrainer.crm.r crm114-20100106-BlameMichelson.src/mailtrainer.crm
+--- crm114-20100106-BlameMichelson.src/mailtrainer.crm.r	2010-01-06 19:38:46.000000000 +0100
++++ crm114-20100106-BlameMichelson.src/mailtrainer.crm	2010-06-19 20:18:43.000000000 +0200
 @@ -90,7 +90,7 @@ isolate (:log_rejections:) //
  #
  #      this ISOLATE will guarantee that :fileprefix: exists, and keep it's
@@ -19,28 +19,28 @@ diff -up crm114-20090807-BlameThorstenAndJenny.src/mailtrainer.crm.r crm114-2009
      # 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:35:10.000000000 +0200
-@@ -98,7 +98,7 @@ CFLAGS += -DVERSION='"$(VERSION)"'
- #  really picayune stuff.
- #
- #  Our default is with debugging, full optimization, and lots of warnings:
--CFLAGS += -O3 -Wall
+diff -up crm114-20100106-BlameMichelson.src/Makefile.r crm114-20100106-BlameMichelson.src/Makefile
+--- crm114-20100106-BlameMichelson.src/Makefile.r	2010-01-06 19:38:46.000000000 +0100
++++ crm114-20100106-BlameMichelson.src/Makefile	2010-06-19 20:20:42.000000000 +0200
+@@ -104,7 +104,7 @@ CFLAGS += -DVERSION='"$(VERSION)"'
+ #  certain functions to be inline (I added that to force gcc to inline functions
+ #  under high optimization but not under low so that debugging is possible - 
+ #  that's why DO_INLINES is defined at O3 but not O0 - JB):
+-CFLAGS += -O3 -Wall -DDO_INLINES
 +CFLAGS += $(OPTFLAGS)
  #     turn this one on for no optimization, but debugging
  #CFLAGS += -g -O0 -Wall
  #
-@@ -111,7 +111,7 @@ CFLAGS += -O3 -Wall
- #   Comment this out if you want dynamic linking
- #
+@@ -119,7 +119,7 @@ CFLAGS += -O3 -Wall -DDO_INLINES
  #    BSD users - do NOT use -static-libgcc!!!
+ #    Also note that this keeps valgrind from running correctly so comment
+ #    it out for debugging.
 -LDFLAGS += -static -static-libgcc
 +#LDFLAGS += -static -static-libgcc
  #    use this one if you want program profiling.
  #LDFLAGS += -static -static-libgcc -pg
  #LDFLAGS += -pg
-@@ -350,13 +350,13 @@ install_utils:
+@@ -361,13 +361,13 @@ install_utils:
  	#    Installing Utilities
  	#
  	$(MAKE) cssmerge cssutil cssdiff osbf-util
@@ -59,7 +59,7 @@ diff -up crm114-20090807-BlameThorstenAndJenny.src/Makefile.r crm114-20090807-Bl
  
  
  # use different name so we can keep it around along with default one
-@@ -365,15 +365,15 @@ install_engine: crm114
+@@ -376,15 +376,15 @@ install_engine: crm114
  	#
  	#    Installing engine
  	#
diff --git a/crm114.spec b/crm114.spec
index bc185cd..fd42286 100644
--- a/crm114.spec
+++ b/crm114.spec
@@ -1,10 +1,10 @@
-%define cvsver 20090807
-%define codename BlameThorstenAndJenny
+%define cvsver 20100106
+%define codename BlameMichelson
 
 Summary: Controllable Regex Mutilator: multi-method content classifier and filter
 Name: crm114
 Version: 0
-Release: 1.13.%{cvsver}%{?dist}
+Release: 1.14.%{cvsver}%{?dist}
 URL: http://crm114.sourceforge.net/
 License: GPLv3
 Group: Applications/Text
@@ -63,6 +63,9 @@ make megatest
 %{_datadir}/emacs/site-lisp/*.el
 
 %changelog
+* Sat Jun 19 2010 Dominik Mierzejewski <rpm@greysector.net> 0-1.14.20100106
+- updated to 20100106 "BlameMichelson"
+
 * Sat Jun 19 2010 Dominik Mierzejewski <rpm@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
diff --git a/sources b/sources
index 7fe63e8..04695f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e3bccda2a497aa1bc78999229b427650  crm114-20090807-BlameThorstenAndJenny.src.tar.gz
+213c0b24a28a6cc0b59abc37e2b88a4b  crm114-20100106-BlameMichelson.src.tar.gz