rpms/crm114/devel .cvsignore, 1.6, 1.7 crm114-rpm.patch, 1.4, 1.5 crm114.spec, 1.10, 1.11 sources, 1.6, 1.7

Dominik Mierzejewski rathann at fedoraproject.org
Sun Aug 23 16:13:07 UTC 2009 

Author: rathann

Update of /cvs/pkgs/rpms/crm114/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9772

Modified Files:
	.cvsignore crm114-rpm.patch crm114.spec sources 
Log Message:
* Sun Aug 23 2009 Dominik Mierzejewski <rpm at greysector.net> 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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/crm114/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	26 Jan 2009 23:47:24 -0000	1.6
+++ .cvsignore	23 Aug 2009 16:13:07 -0000	1.7
@@ -1 +1 @@
-crm114-20080703-BlameVT.src.tar.gz
+crm114-20090807-BlameThorstenAndJenny.src.tar.gz

crm114-rpm.patch:
 Makefile |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

Index: crm114-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/crm114/devel/crm114-rpm.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- crm114-rpm.patch	9 Jul 2008 18:38:45 -0000	1.4
+++ crm114-rpm.patch	23 Aug 2009 16:13:07 -0000	1.5
@@ -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/Mak
  
  
  # 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/Mak
 -	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)
  


Index: crm114.spec
===================================================================
RCS file: /cvs/pkgs/rpms/crm114/devel/crm114.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- crm114.spec	24 Jul 2009 19:39:10 -0000	1.10
+++ crm114.spec	23 Aug 2009 16:13:07 -0000	1.11
@@ -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 scri
 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 <rpm at greysector.net> 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 <rel-eng at lists.fedoraproject.org> - 0-1.10.20080703
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/crm114/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	26 Jan 2009 23:47:24 -0000	1.6
+++ sources	23 Aug 2009 16:13:07 -0000	1.7
@@ -1 +1 @@
-51ba5490d9787de9461a28a79da59586  crm114-20080703-BlameVT.src.tar.gz
+e3bccda2a497aa1bc78999229b427650  crm114-20090807-BlameThorstenAndJenny.src.tar.gz

More information about the scm-commits mailing list