rpms/crm114/devel crm114-rpm.patch, NONE, 1.1 crm114.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Thu Aug 17 23:03:37 UTC 2006

Author: rathann

Update of /cvs/extras/rpms/crm114/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21301/devel

Modified Files:
	.cvsignore sources 
Added Files:
	crm114-rpm.patch crm114.spec 
Log Message:
auto-import crm114-0-0.1.20060704 on branch devel from crm114-0-0.1.20060704.src.rpm

crm114-rpm.patch:

--- NEW FILE crm114-rpm.patch ---
--- crm114-20060704a-BlameRobert.src/megatest.sh.r	2006-07-08 04:48:12.000000000 +0200
+++ crm114-20060704a-BlameRobert.src/megatest.sh	2006-08-16 22:56:23.000000000 +0200
@@ -50,7 +50,7 @@
 crm skudtest.crm 
 crm statustest.crm 
 #./exectest.crm
-./unionintersecttest.crm 
+crm unionintersecttest.crm 
 crm beeptest.crm 
 crm userdirtest.crm 
 crm windowtest.crm  <<-EOF
--- crm114-20060704a-BlameRobert.src/Makefile.r	2006-07-08 04:48:12.000000000 +0200
+++ crm114-20060704a-BlameRobert.src/Makefile	2006-08-16 22:53:12.000000000 +0200
@@ -47,7 +47,7 @@
 #  Tell the compiler full optimization, allow debugging, and warn on every
 #  possible error
 #  
-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.
@@ -56,7 +56,7 @@
 #   Choose between static and dynamic linking (we recommend static linking)
 #   Comment this out if you want dynamic linking
 #
-LDFLAGS += -static
+#LDFLAGS += -static
 #
 #   Any standard install flags?  We nominally use protection 755
 INSTALLFLAGS += -m 755
@@ -314,13 +314,13 @@
 		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 \
@@ -354,29 +354,29 @@
 
 install_utils:
 	$(MAKE) cssmerge cssutil cssdiff osbf-util
-	install $(INSTALLFLAGS) cssdiff $(BINDIR)/cssdiff$(VER_SUFFIX)
-	install $(INSTALLFLAGS) cssmerge $(BINDIR)/cssmerge$(VER_SUFFIX)
-	install $(INSTALLFLAGS) cssutil $(BINDIR)/cssutil$(VER_SUFFIX)
-	install $(INSTALLFLAGS) osbf-util $(BINDIR)/osbf-util$(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) osbf-util $(DESTDIR)$(BINDIR)/osbf-util$(VER_SUFFIX)
 	#   if you don't have EMACS installed in the default place, you
 	#   won't get the crm114-mode.el automatically.
-	-install $(INSTALLFLAGS) crm114-mode.el /usr/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
+	-install $(INSTALLFLAGS) crm114-mode.el $(DESTDIR)/usr/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
 
 install_tre: crm114_tre
-	install $(INSTALLFLAGS) crm114_tre $(BINDIR)/crm$(VER_SUFFIX)
+	install $(INSTALLFLAGS) crm114_tre $(DESTDIR)$(BINDIR)/crm$(VER_SUFFIX)
 
 # use different name so we can keep it around along with default one
 # and same VER_SUFFIX postfix 
 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_tre $(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) osbf-util $(BINDIR)/osbf-util$(VER_SUFFIX)
-	-install $(INSTALLFLAGS) crm114-mode.el /usr/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
+	install $(INSTALLFLAGS) crm114_tre $(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) osbf-util $(DESTDIR)$(BINDIR)/osbf-util$(VER_SUFFIX)
+	-install $(INSTALLFLAGS) crm114-mode.el $(DESTDIR)/usr/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
 
 uninstall: FORCE
 	-rm -rf $(BINDIR)/crm$(VER_SUFFIX)


--- NEW FILE crm114.spec ---
%define cvsver 20060704
%define codename BlameRobert
%define rel 1

Summary: CRM114 Bayesian Spam Detector
Name: crm114
Version: 0
Release: 0.%{rel}.%{cvsver}%{?dist}
URL: http://crm114.sourceforge.net/
License: GPL
Group: Applications/Text
Source0: http://crm114.sourceforge.net/%{name}-%{cvsver}a-%{codename}.no-TRE.src.tar.gz
Patch0: %{name}-rpm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
BuildRequires: tre-devel
# crashes: BZ#202893
ExcludeArch: x86_64

%description 
CRM114 is a system to examine incoming e-mail, system log streams,
data files or other data streams, and to sort, filter, or alter the
incoming files or data streams according to the user's wildest
desires. Criteria for categorization of data can be by satisfaction of
regexes, by sparse binary polynomial matching with a Bayesian Chain
Rule evaluator, or by other means.

%package emacs
Summary: CRM114 mode for Emacs
Group: Applications/Text
Requires: emacs-el

%description emacs
Major Emacs mode for editing crm114 scripts.

%prep
%setup -q -n %{name}-%{cvsver}a-%{codename}.src
%patch0 -p1 -b .r
chmod 644 README *.cf *.h *.recipe *.txt

%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS"

%clean 
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
install -pm 755 mail{filter,reaver,trainer}.crm $RPM_BUILD_ROOT%{_datadir}/%{name}/
install -pm 644 maillib.crm $RPM_BUILD_ROOT%{_datadir}/%{name}/

%check
export PATH=`pwd`:$PATH
ln -s crm114_tre crm
make megatest

%files
%defattr(-,root,root,-)
%doc README *.txt *.recipe *.example mailfilter.cf
%{_bindir}/*
%{_datadir}/%{name}

%files emacs
%defattr(644,root,root,755)
%{_datadir}/emacs/site-lisp/*.el

%changelog
* Wed Aug 16 2006 Dominik Mierzejewski <rpm at greysector.net> 0-0.1.20060704
- FE-compliant versioning
- emacs subpackage should require emacs-el
- simplified file list
- added %%check
- small patch to make 'make megatest' work from current dir
- ExcludeArch: x86_64 until 64bit tre is fixed

* Wed Jul 26 2006 Dominik Mierzejewski <rpm at greysector.net>
- 20060704a release
- added -emacs package with crm mode for emacs
- fixed parallel make build
- use dist tag
- shut up rpmlint

* Sun Feb 19 2006 Dominik Mierzejewski <rpm at greysector.net> 0-0.1.20060118
- FE compliance
- package mailfilter scripts

* Mon Dec 15 2003 Bill Yerazunis <wsy at merl.com>
- removed -RCx stuff, now version contains it.
- updated for version 20031215-RC12
- License is GPL, not Artistic, so I corrected that.

* Sat Dec 13 2003 Kevin Fenzi <kevin-crm114 at tummy.com>
- Converted line endings from dos format to unix. 
- Changed BuildPreReq to be 'tre-devel' 
- Fixed install to install into rpm build root. 
- tested on redhat 9 with latest tre. 

* Tue Oct 22 2003 Nico Kadel-Garcia <nkadel at merl.com>
- Created RedHat compatible .spec file
- Added libtre dependency to avoid building second package
- Hard-coded "INSTALL_DIR" in build/install setups


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/crm114/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Aug 2006 22:58:06 -0000	1.1
+++ .cvsignore	17 Aug 2006 23:03:36 -0000	1.2
@@ -0,0 +1 @@
+crm114-20060704a-BlameRobert.no-TRE.src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crm114/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Aug 2006 22:58:06 -0000	1.1
+++ sources	17 Aug 2006 23:03:36 -0000	1.2
@@ -0,0 +1 @@
+7fec214c03679398979387b22e96b1d9  crm114-20060704a-BlameRobert.no-TRE.src.tar.gz


