From a1832055454267ce0875a95bf5b8a84355118f29 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Jan 29 2009 19:33:51 +0000 Subject: - updated to 20080703 "BlameVT" - dropped obsolete patch - fixed license tag - corrected Summary: --- diff --git a/.cvsignore b/.cvsignore index 7bf5cd9..9ba6d7f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -crm114-20070301-BlameBaltar.no-TRE.src.tar.bz2 +crm114-20080703-BlameVT.src.tar.gz diff --git a/crm114-64bit.patch b/crm114-64bit.patch deleted file mode 100644 index be6a819..0000000 --- a/crm114-64bit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- crm114-20070301-BlameBaltar.no-TRE.src/crm_str_funcs.c.64bit 2007-03-02 16:33:55.000000000 +0100 -+++ crm114-20070301-BlameBaltar.no-TRE.src/crm_str_funcs.c 2007-04-17 19:03:50.000000000 +0200 -@@ -103,7 +103,7 @@ - { - long i; - // unsigned long hval; -- long hval; -+ int32_t hval; - unsigned long tmp; - - // initialize hval diff --git a/crm114-rpm.patch b/crm114-rpm.patch index 7e64ab5..6df09a2 100644 --- a/crm114-rpm.patch +++ b/crm114-rpm.patch @@ -1,31 +1,25 @@ ---- /dev/null 2007-04-15 01:47:43.733920889 +0200 -+++ crm114-20070301-BlameBaltar.no-TRE.src/quine.crm 2007-04-15 21:45:04.000000000 +0200 -@@ -0,0 +1,4 @@ -+{ -+ window -+ output /:*:_pgm_text:/ -+} ---- crm114-20070301-BlameBaltar.no-TRE.src/Makefile.r 2007-03-02 16:33:55.000000000 +0100 -+++ crm114-20070301-BlameBaltar.no-TRE.src/Makefile 2007-04-15 22:04:51.000000000 +0200 -@@ -52,7 +52,7 @@ - # Tell the compiler full optimization, allow debugging, and warn on every - # possible error +diff -up crm114-20080703-BlameVT.src/Makefile.r crm114-20080703-BlameVT.src/Makefile +--- crm114-20080703-BlameVT.src/Makefile.r 2008-07-01 01:28:43.000000000 +0200 ++++ crm114-20080703-BlameVT.src/Makefile 2008-07-09 19:57:41.000000000 +0200 +@@ -72,7 +72,7 @@ SYSTEMTYPE = POSIX + # really picayune stuff. # --CFLAGS += -O3 -g -Wall -+#CFLAGS += -O3 -g -Wall - # turn this one on for no optimization debugging. - #CFLAGS += -O0 -g -Wall - # turn this one on for really picayune debugging. -@@ -62,7 +62,7 @@ - # Comment this out if you want dynamic linking - # + # Our default is with debugging, full optimization, and lots of warnings: +-CFLAGS += -g -O3 -Wall ++#CFLAGS += -g -O3 -Wall + # turn this one on for no optimization, but debugging and time profiling: + #CFLAGS += -g -O0 -Wall -pg + # turn this one on for really picayune debugging: +@@ -84,7 +84,7 @@ CFLAGS += -g -O3 -Wall # BSD users - do NOT use -static-libgcc!!! --LDFLAGS += -static -static-libgcc -+#LDFLAGS += -static -static-libgcc + #LDFLAGS += -static -static-libgcc + # use this one if you want program profiling. +-LDFLAGS += -static -static-libgcc -pg ++#LDFLAGS += -static -static-libgcc -pg # # Any standard install flags? We nominally use protection 755 INSTALLFLAGS += -m 755 -@@ -360,13 +360,13 @@ +@@ -454,13 +454,13 @@ osbf-util: osbf-util.c crm_osbf_maintena crm_util_errorhandlers.o \ crm_osbf_maintenance.o -lm -ltre -o osbf-util @@ -41,9 +35,9 @@ $(CC) $(CFLAGS) $(LDFLAGS) -D$(SYSTEMTYPE) -DVERSION='"$(VERSION)"' \ crm_str_funcs.o \ crm_util_errorhandlers.o \ -@@ -400,30 +400,30 @@ - - install_utils: +@@ -493,13 +493,13 @@ install_utils: + # Installing Utilities + # $(MAKE) cssmerge cssutil cssdiff osbf-util - install $(INSTALLFLAGS) cssdiff $(BINDIR)/cssdiff$(VER_SUFFIX) - install $(INSTALLFLAGS) cssmerge $(BINDIR)/cssmerge$(VER_SUFFIX) @@ -60,15 +54,13 @@ # use different name so we can keep it around along with default one - # and same VER_SUFFIX postfix - install_engine: crm114 +@@ -508,15 +508,15 @@ install_engine: crm114 + # + # Installing engine + # - install $(INSTALLFLAGS) crm114 $(BINDIR)/crm$(VER_SUFFIX) + install $(INSTALLFLAGS) crm114 $(DESTDIR)$(BINDIR)/crm$(VER_SUFFIX) - install_gnu: crm114_gnu -- install $(INSTALLFLAGS) crm114_gnu $(BINDIR)/crmg$(VER_SUFFIX) -+ install $(INSTALLFLAGS) crm114_gnu $(DESTDIR)$(BINDIR)/crmg$(VER_SUFFIX) - install_binary_only: FORCE - install $(INSTALLFLAGS) crm114 $(BINDIR)/crm$(VER_SUFFIX) - install $(INSTALLFLAGS) cssdiff $(BINDIR)/cssdiff$(VER_SUFFIX) diff --git a/crm114.spec b/crm114.spec index 5b6c794..c03283a 100644 --- a/crm114.spec +++ b/crm114.spec @@ -1,17 +1,16 @@ -%define cvsver 20070301 -%define codename BlameBaltar -%define rel 3 +%define cvsver 20080703 +%define codename BlameVT +%define rel 4 -Summary: CRM114 Bayesian Spam Detector +Summary: CRM114 content classifier Name: crm114 Version: 0 Release: 0.%{rel}.%{cvsver}%{?dist} URL: http://crm114.sourceforge.net/ -License: GPL +License: GPLv2 Group: Applications/Text -Source0: http://crm114.sourceforge.net/%{name}-%{cvsver}-%{codename}.no-TRE.src.tar.bz2 +Source0: http://crm114.sourceforge.net/%{name}-%{cvsver}-%{codename}.src.tar.gz Patch0: %{name}-rpm.patch -Patch1: %{name}-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) BuildRequires: tre-devel @@ -32,10 +31,9 @@ Requires: emacs-el Major Emacs mode for editing crm114 scripts. %prep -%setup -q -n %{name}-%{cvsver}-%{codename}.no-TRE.src +%setup -q -n %{name}-%{cvsver}-%{codename}.src %patch0 -p1 -b .r -%patch1 -p1 -b .64bit -chmod 644 README *.cf *.h *.recipe *.txt +chmod 644 mailfilter.cf %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" @@ -46,7 +44,7 @@ rm -rf $RPM_BUILD_ROOT %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/{%{name},emacs/site-lisp}} -make DESTDIR=$RPM_BUILD_ROOT install +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 $RPM_BUILD_ROOT%{_datadir}/%{name}/ @@ -64,6 +62,12 @@ make megatest %{_datadir}/emacs/site-lisp/*.el %changelog +* Thu Jan 29 2009 Dominik Mierzejewski 0-0.4.20080703 +- updated to 20080703 "BlameVT" +- dropped obsolete patch +- fixed license tag +- corrected Summary: + * Tue Apr 17 2007 Dominik Mierzejewski 0-0.3.20070301 - fix testsuite on 64bit, patch by Jaakko Hyvätti - updated to 20070301 "BlameBaltar" diff --git a/sources b/sources index 854f019..36b09b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f9570a0e726914b9abc71da583213d99 crm114-20070301-BlameBaltar.no-TRE.src.tar.bz2 +51ba5490d9787de9461a28a79da59586 crm114-20080703-BlameVT.src.tar.gz