From 9da97cab36a28f76ecf804f459f6cceeb9694b34 Mon Sep 17 00:00:00 2001
From: Adrian Reber <adrian@fedoraproject.org>
Date: Dec 13 2007 21:10:38 +0000
Subject: - updated to 1.1.6

- made rpmlint happy
- upstream confirmed that bogofilter is GPLv2

---

diff --git a/.cvsignore b/.cvsignore
index 1702623..c114c41 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-bogofilter-1.1.5.tar.gz
+bogofilter-1.1.6.tar.gz
diff --git a/bogofilter-1.1.5.glibc.patch b/bogofilter-1.1.5.glibc.patch
deleted file mode 100644
index f02e2f1..0000000
--- a/bogofilter-1.1.5.glibc.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- src/datastore_db.c	2006-07-02 23:38:55.000000000 +0200
-+++ src/datastore_db.c.new	2007-08-23 12:21:37.000000000 +0200
-@@ -181,7 +181,7 @@
-     else
- 	file = bfp->filename;
- 
--    ret = db->open(db,
-+    ret = (db->open)(db,
- #if DB_AT_LEAST(4,1)
- 		   0,	/* TXN handle - we use autocommit instead */
- #endif
---- src/datastore_db_trans.c	2006-05-29 16:28:00.000000000 +0200
-+++ src/datastore_db_trans.c.new	2007-08-23 12:21:37.000000000 +0200
-@@ -215,7 +215,7 @@
-      * environment in heap memory, so we don't need to remove it.
-      */
- 
--    e = dbe->open(dbe, bfp->dirname,
-+    e = (dbe->open)(dbe, bfp->dirname,
- 		  dbenv_defflags | local_flags | DB_RECOVER, DS_MODE);
-     if (e != 0) {
- 	print_error(__FILE__, __LINE__, "Cannot recover environment \"%s\": %s",
-@@ -502,7 +502,7 @@
- 
-     flags |= DB_CREATE | dbenv_defflags;
- 
--    ret = env->dbe->open(env->dbe, bfp->dirname, flags, DS_MODE);
-+    ret = (env->dbe->open)(env->dbe, bfp->dirname, flags, DS_MODE);
-     if (ret != 0) {
- 	env->dbe->close(env->dbe, 0);
- 	print_error(__FILE__, __LINE__, "DB_ENV->open, err: %d, %s", ret, db_strerror(ret));
-@@ -873,7 +873,7 @@
-      * effort, we'll just check for DB_RUNRECOVERY */
- 
- #if DB_AT_LEAST(3,2)
--    r = dbe->open(dbe, bfp->dirname, DB_JOINENV, DS_MODE);
-+    r = (dbe->open)(dbe, bfp->dirname, DB_JOINENV, DS_MODE);
- #else
-     r = ENOENT;
- #endif
diff --git a/bogofilter.spec b/bogofilter.spec
index 7c75fb2..b9a7aec 100644
--- a/bogofilter.spec
+++ b/bogofilter.spec
@@ -1,14 +1,14 @@
 Summary: Fast anti-spam filtering by Bayesian statistical analysis
 Name: bogofilter
-Version: 1.1.5
-Release: 2%{?dist}
-License: GPL
+Version: 1.1.6
+Release: 1%{?dist}
+License: GPLv2
 Group: Applications/Internet
 URL: http://bogofilter.sourceforge.net/
 Source: http://downloads.sourceforge.net/bogofilter/bogofilter-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex db4-devel gsl-devel
-Patch: bogofilter-1.1.5.glibc.patch
+BuildRequires: /usr/bin/iconv
 
 %description
 Bogofilter is a Bayesian spam filter.  In its normal mode of
@@ -21,7 +21,10 @@ by sites that process a lot of mail.
 
 %prep
 %setup -q
-%patch
+iconv -f iso-8859-1 -t utf-8 \
+ doc/bogofilter-faq-fr.html > doc/bogofilter-faq-fr.html.utf8
+%{__mv} -f doc/bogofilter-faq-fr.html.utf8 \
+ doc/bogofilter-faq-fr.html
 
 %build
 %configure
@@ -31,7 +34,8 @@ by sites that process a lot of mail.
 %{__rm} -rf %{buildroot}
 %makeinstall
 
-%{__mv} -f %{buildroot}%{_sysconfdir}/bogofilter.cf.example %{buildroot}%{_sysconfdir}/bogofilter.cf
+%{__mv} -f %{buildroot}%{_sysconfdir}/bogofilter.cf.example \
+ %{buildroot}%{_sysconfdir}/bogofilter.cf
 
 %{__install} -d -m0755 rpm-doc/xml/ rpm-doc/html/
 %{__install} -m644 doc/*.xml rpm-doc/xml/
@@ -54,6 +58,11 @@ by sites that process a lot of mail.
 %{_bindir}/bf_*
 
 %changelog
+* Thu Dec 13 2007 Adrian Reber <adrian@lisas.de> - 1.1.6-1
+- updated to 1.1.6
+- made rpmlint happy
+- upstream confirmed that bogofilter is GPLv2
+
 * Thu Aug 23 2007 Adrian Reber <adrian@lisas.de> - 1.1.5-2
 - rebuilt
 - added patch to build with new glibc
diff --git a/sources b/sources
index 86b1e36..e71fe7e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-25558e2e72350ee2e4edfc1b617f6738  bogofilter-1.1.5.tar.gz
+35ec52e5d2c58de04a1e02ddcc8d0252  bogofilter-1.1.6.tar.gz