--- rpms/smeserver-denyhosts/contribs7/smeserver-denyhosts.spec	2008/04/24 07:49:36	1.8
+++ rpms/smeserver-denyhosts/contribs7/smeserver-denyhosts.spec	2008/05/05 19:02:45	1.11
@@ -1,11 +1,11 @@
-# $Id: smeserver-denyhosts.spec,v 1.7 2008/04/23 23:37:02 unnilennium Exp $
+# $Id: smeserver-denyhosts.spec,v 1.10 2008/04/28 23:21:44 slords Exp $
 # Authority: unnilennium
 # Name: Jean-Philippe Pialasse 
 
 Summary: smeserver-denyhosts
 %define name smeserver-denyhosts
 %define version 2.6
-%define release 7
+%define release 9
 Name:                   %{name}
 Version: 		%{version}
 Release: 		%{release}%{?dist}
@@ -14,14 +14,17 @@ Group: 			Applications/System
 Source: 		%{name}-%{version}.tgz
 Patch0:                 smeserver-denyhosts-2.6-locale-2008-04-22.patch
 Patch1:                 smeserver-denyhosts-2.6-locale-2008-04-23.patch
-Patch2:			smeserver-denyhosts-2.6-patch2.patch
-Patch3:			smeserver-denyhosts-2.6-patch3.patch
+Patch2:	                smeserver-denyhosts-2.6-patch2.patch
+Patch3:	                smeserver-denyhosts-2.6-patch3.patch
+Patch4:                 smeserver-denyhosts-2.6-add2general.patch
+Patch5:                 smeserver-denyhosts-2.6-locale-2008-05-05.patch
 Url: 			http://smeserver.pialasse.com/
 BuildRoot:              /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArch:		noarch
 BuildRequires:          e-smith-devtools >= 1.13.1-03
 Requires:               smeserver-release >= 7.0
 Requires:               denyhosts >= 2.6
+Requires:               e-smith-formmagick >= 1.4.0-12
 
 %description
 Integration package to mesh denyhosts with SME Server.
@@ -32,6 +35,8 @@ Integration package to mesh denyhosts wi
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 /usr/bin/perl createlinks
@@ -52,8 +57,15 @@ rm -rf $RPM_BUILD_ROOT
 touch /etc/hosts.deny_ssh
 
 %changelog
+* Mon May 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 2.6-9
+- Apply 5 May 2008 locale patch
+
+* Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 2.6-8
+- Add common <base> tags to e-smith-formmagick's general
+- Fix referrals to the SME Server Bug Tracker
+
 * Tue Apr 24 2008 JP PIALASSE <tests@pialasse.Com> 2.6-7
-- stop when disable service [SME 4528]
+- stop when disable service [SME: 4528]
 - adding local 
 
 * Wed Apr 23 2008 JP PIALASSE <tests@pialasse.com> 2.6-6