diff --git a/.cvsignore b/.cvsignore index 9ba6d7f..d41f5f8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -crm114-20080703-BlameVT.src.tar.gz +crm114-20090807-BlameThorstenAndJenny.src.tar.gz diff --git a/crm114-rpm.patch b/crm114-rpm.patch index 6df09a2..21b1658 100644 --- a/crm114-rpm.patch +++ b/crm114-rpm.patch @@ -1,43 +1,27 @@ -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 +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 +@@ -98,7 +98,7 @@ CFLAGS += -DVERSION='"$(VERSION)"' # really picayune stuff. - # + # # 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 +-CFLAGS += -O3 -Wall ++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 + # # 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 -@@ -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 - --cssdiff: cssdiff.c crm_util_errorhandlers.o $(HFILES) -+cssdiff: cssdiff.c crm_util_errorhandlers.o crm_str_funcs.o $(HFILES) - $(CC) $(CFLAGS) -D$(SYSTEMTYPE) -DVERSION='"$(VERSION)"' -c cssdiff.c -o cssdiff.o - $(CC) $(CFLAGS) $(LDFLAGS) \ - crm_util_errorhandlers.o \ - crm_str_funcs.o -ltre cssdiff.o -o cssdiff - --cssmerge: cssmerge.c crm_util_errorhandlers.o $(HFILES) -+cssmerge: cssmerge.c crm_util_errorhandlers.o crm_str_funcs.o $(HFILES) - $(CC) $(CFLAGS) $(LDFLAGS) -D$(SYSTEMTYPE) -DVERSION='"$(VERSION)"' \ - crm_str_funcs.o \ - crm_util_errorhandlers.o \ -@@ -493,13 +493,13 @@ install_utils: + #LDFLAGS += -static -static-libgcc -pg + #LDFLAGS += -pg +@@ -350,13 +350,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) @@ -54,7 +38,7 @@ diff -up crm114-20080703-BlameVT.src/Makefile.r crm114-20080703-BlameVT.src/Make # use different name so we can keep it around along with default one -@@ -508,15 +508,15 @@ install_engine: crm114 +@@ -365,15 +365,15 @@ install_engine: crm114 # # Installing engine # @@ -65,13 +49,13 @@ diff -up crm114-20080703-BlameVT.src/Makefile.r crm114-20080703-BlameVT.src/Make - install $(INSTALLFLAGS) crm114 $(BINDIR)/crm$(VER_SUFFIX) - install $(INSTALLFLAGS) cssdiff $(BINDIR)/cssdiff$(VER_SUFFIX) - install $(INSTALLFLAGS) cssmerge $(BINDIR)/cssmerge$(VER_SUFFIX) -- install $(INSTALLFLAGS) cssutil $(BINDIR)/cssutil$(VER_SUFFIX) +- install $(INSTALLFLAGS) cssutil $(BINDIR)/cssutil$(VER_SUFFIX) - install $(INSTALLFLAGS) osbf-util $(BINDIR)/osbf-util$(VER_SUFFIX) - -install $(INSTALLFLAGS) crm114-mode.el $(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX) + install $(INSTALLFLAGS) crm114 $(DESTDIR)$(BINDIR)/crm$(VER_SUFFIX) + install $(INSTALLFLAGS) cssdiff $(DESTDIR)$(BINDIR)/cssdiff$(VER_SUFFIX) + install $(INSTALLFLAGS) cssmerge $(DESTDIR)$(BINDIR)/cssmerge$(VER_SUFFIX) -+ install $(INSTALLFLAGS) cssutil $(DESTDIR)$(BINDIR)/cssutil$(VER_SUFFIX) ++ install $(INSTALLFLAGS) cssutil $(DESTDIR)$(BINDIR)/cssutil$(VER_SUFFIX) + install $(INSTALLFLAGS) osbf-util $(DESTDIR)$(BINDIR)/osbf-util$(VER_SUFFIX) + -install $(INSTALLFLAGS) crm114-mode.el $(DESTDIR)$(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX) diff --git a/crm114.spec b/crm114.spec index 43f8171..0626975 100644 --- a/crm114.spec +++ b/crm114.spec @@ -1,15 +1,14 @@ -%define cvsver 20080703 -%define codename BlameVT -%define rel 10 +%define cvsver 20090807 +%define codename BlameThorstenAndJenny Summary: CRM114 Bayesian Spam Detector Name: crm114 Version: 0 -Release: 1.%{rel}.%{cvsver}%{?dist} +Release: 1.11.%{cvsver}%{?dist} URL: http://crm114.sourceforge.net/ -License: GPLv2 +License: GPLv3 Group: Applications/Text -Source0: http://crm114.sourceforge.net/%{name}-%{cvsver}-%{codename}.src.tar.gz +Source0: http://crm114.sourceforge.net/tarballs/%{name}-%{cvsver}-%{codename}.src.tar.gz Patch0: %{name}-rpm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) BuildRequires: tre-devel @@ -36,7 +35,7 @@ Major Emacs mode for editing crm114 scripts. chmod 644 mailfilter.cf %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" +make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" %clean rm -rf $RPM_BUILD_ROOT @@ -62,6 +61,13 @@ make megatest %{_datadir}/emacs/site-lisp/*.el %changelog +* Sun Aug 23 2009 Dominik Mierzejewski 0-1.11.20090807 +- updated to 20090807 "BlameThorstenAndJenny" +- dropped upstreamed patch hunks, rebased patch +- updated source URL +- license changed to GPLv3 +- needs release note: .css files format has changed, they must be rebuilt + * Fri Jul 24 2009 Fedora Release Engineering - 0-1.10.20080703 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 36b09b9..7fe63e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -51ba5490d9787de9461a28a79da59586 crm114-20080703-BlameVT.src.tar.gz +e3bccda2a497aa1bc78999229b427650 crm114-20090807-BlameThorstenAndJenny.src.tar.gz