Merge branch 'master' into el6

3 files changed, 29 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
index 2dc3c45..1aa96b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 bogofilter-1.2.2.tar.gz
 /bogofilter-1.2.3.tar.gz
+/bogofilter-1.2.3.repack.tar.gz
+/bogofilter-1.2.4.repack.tar.gz
diff --git a/bogofilter.spec b/bogofilter.spec
index d7703c8..19c48e3 100644
--- a/bogofilter.spec
+++ b/bogofilter.spec
@@ -1,12 +1,19 @@
 Summary: Fast anti-spam filtering by Bayesian statistical analysis
 Name: bogofilter
-Version: 1.2.3
+Version: 1.2.4
 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)
+# Source: http://downloads.sourceforge.net/bogofilter/bogofilter-%{version}.tar.gz
+# The above used to be to the Source: line
+# but due to bug 912694 which identified three files with license
+# problems the following steps are necessary to repack bogofilter
+# wget http://downloads.sourceforge.net/bogofilter/bogofilter-1.2.4.tar.gz
+# tar xf bogofilter-1.2.4.tar.gz 
+# rm bogofilter-1.2.4/doc/bogofilter-SA-20[0-1][0,5]-0[1,2]
+# tar cf bogofilter-1.2.4.repack.tar.gz bogofilter-1.2.4
+Source: bogofilter-%{version}.repack.tar.gz
 BuildRequires: flex db4-devel gsl-devel
 BuildRequires: /usr/bin/iconv
 
@@ -45,7 +52,6 @@ CFLAGS="%{optflags} -I%{_includedir}/libdb4" LDFLAGS="-L%{_libdir}/libdb4" %conf
 %{__make} %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 
 %{__mv} -f %{buildroot}%{_sysconfdir}/bogofilter.cf.example \
@@ -57,9 +63,6 @@ CFLAGS="%{optflags} -I%{_includedir}/libdb4" LDFLAGS="-L%{_libdir}/libdb4" %conf
 
 %{__chmod} -x contrib/*
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %files bogoupgrade
 %defattr(-, root, root, 0755)
 %{_bindir}/bogoupgrade
@@ -79,6 +82,21 @@ CFLAGS="%{optflags} -I%{_includedir}/libdb4" LDFLAGS="-L%{_libdir}/libdb4" %conf
 %exclude %{_mandir}/man1/bogoupgrade*
 
 %changelog
+* Wed Apr 23 2014 Adrian Reber <adrian@lisas.de> - 1.2.4-1
+- updated to 1.2.4 (fixes #1084359)
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 1.2.3-4
+- Perl 5.18 rebuild
+
+* Fri Feb 22 2013 Adrian Reber <adrian@lisas.de> - 1.2.3-2
+- removed three files with an unfree license from Source (fixes #912694)
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Tue Dec 04 2012 Adrian Reber <adrian@lisas.de> - 1.2.3-1
 - updated to 1.2.3 (fixes #883358, CVE-2012-5468)
 
@@ -100,7 +118,7 @@ CFLAGS="%{optflags} -I%{_includedir}/libdb4" LDFLAGS="-L%{_libdir}/libdb4" %conf
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Mon Feb 26 2009 Adrian Reber <adrian@lisas.de> - 1.2.0-1
+* Thu Feb 26 2009 Adrian Reber <adrian@lisas.de> - 1.2.0-1
 - updated to 1.2.0
 
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.7-3
diff --git a/sources b/sources
index cd9a92f..fdc29aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aec710e967a7378f57267db70fe3217b  bogofilter-1.2.3.tar.gz
+6b3564876c6a571880edfdf57bd501ae  bogofilter-1.2.4.repack.tar.gz