--- rpms/smeserver-wbl/contribs8/smeserver-wbl.spec	2013/07/16 00:22:43	1.4
+++ rpms/smeserver-wbl/contribs8/smeserver-wbl.spec	2014/04/11 20:03:52	1.7
@@ -1,4 +1,5 @@
-# $Id: smeserver-wbl.spec,v 1.3 2013/07/16 00:07:44 unnilennium Exp $
+
+# $Id: smeserver-wbl.spec,v 1.6 2014/04/08 21:56:52 stephdl Exp $
 # Authority: gzartman
 # Name: Greg Zartman
 
@@ -6,7 +7,7 @@ Summary: E-mail white/black lists for SM
 %define name smeserver-wbl
 Name: %{name}
 %define version 0.1.0
-%define release 19
+%define release 20
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -32,10 +33,11 @@ Patch17: smeserver-wbl-0.1.0-locale-2011
 Patch18: smeserver-wbl-0.1.0-locale-2013-07-15.patch
 Patch19: smeserver-wbl-0.1.0-ReqRes.patch
 Patch20: smeserver-wbl-0.1.0-WBLentry.patch
+Patch21: smeserver-wbl-0.1.0_earlier_declaration_in_same_scope.patch
 BuildRoot: /var/tmp/%{name}-%{version}
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools >= 1.13.1-03
-Requires: smeserver-release => 7.0
+Requires: smeserver-release => 8.0
 AutoReqProv: no
 
 %description
@@ -46,6 +48,10 @@ qpsmtpd whitelist_soft /var/service/qpsm
 spamassassin /etc/mail/spammassassin/local.cf whitelist_from
 
 %changelog
+* Tue Apr 8 2014 Stephane de Labrusse <stephdl@de-labrusse.fr> 0.1.0-20.sme
+- patch to rename variables which have earlier declarations in the same scope. [SME: 8319]
+- add a new usage legend for whitelistsenders by john crisp [SME: 8321]
+
 * Mon Jul 15 2013 JP Pialasse <tests@pialasse.com> 0.1.0-19.sme
 - apply locale 2013-07-15 patch
 - fix for SME8 [SME: 7007]
@@ -169,7 +175,7 @@ spamassassin /etc/mail/spammassassin/loc
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
-
+%patch21 -p1
 %build
 perl createlinks