Merge branch 'master' into el6

Conflicts:
	.gitignore

3 files changed, 20 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index 5bce9cf..2dc3c45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-bogofilter-1.2.0.tar.gz
+bogofilter-1.2.2.tar.gz
+/bogofilter-1.2.3.tar.gz
diff --git a/bogofilter.spec b/bogofilter.spec
index dff3b69..d7703c8 100644
--- a/bogofilter.spec
+++ b/bogofilter.spec
@@ -1,6 +1,6 @@
 Summary: Fast anti-spam filtering by Bayesian statistical analysis
 Name: bogofilter
-Version: 1.2.2
+Version: 1.2.3
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
@@ -41,7 +41,7 @@ iconv -f iso-8859-1 -t utf-8 \
  doc/bogofilter-faq-fr.html
 
 %build
-%configure --disable-rpath
+CFLAGS="%{optflags} -I%{_includedir}/libdb4" LDFLAGS="-L%{_libdir}/libdb4" %configure --disable-rpath
 %{__make} %{?_smp_mflags}
 
 %install
@@ -79,6 +79,21 @@ iconv -f iso-8859-1 -t utf-8 \
 %exclude %{_mandir}/man1/bogoupgrade*
 
 %changelog
+* Tue Dec 04 2012 Adrian Reber <adrian@lisas.de> - 1.2.3-1
+- updated to 1.2.3 (fixes #883358, CVE-2012-5468)
+
+* Thu Jul 26 2012 Adrian Reber <adrian@lisas.de> - 1.2.2-5
+- add new libdb4 include path to configure options
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Mon Aug 16 2010 Adrian Reber <adrian@lisas.de> - 1.2.2-1
 - updated to 1.2.2 (fixes #611551, CVE-2010-2494)
 
diff --git a/sources b/sources
index 79d7260..cd9a92f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-39d27c13eae8a5064d68e20d585e60de  bogofilter-1.2.2.tar.gz
+aec710e967a7378f57267db70fe3217b  bogofilter-1.2.3.tar.gz