From 9da97cab36a28f76ecf804f459f6cceeb9694b34 Mon Sep 17 00:00:00 2001
From: Adrian Reber <adrian@fedoraproject.org>
Date: Thu, 13 Dec 2007 21:10:38 +0000
Subject: - updated to 1.1.6 - made rpmlint happy - upstream confirmed that
 bogofilter is GPLv2

---
 bogofilter.spec | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'bogofilter.spec')

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
-- 
cgit