--- rpms/smeserver-hwinfo/contribs7/smeserver-hwinfo.spec	2008/04/22 18:26:45	1.4
+++ rpms/smeserver-hwinfo/contribs7/smeserver-hwinfo.spec	2008/05/21 20:15:37	1.11
@@ -1,10 +1,10 @@
-# $Id: smeserver-hwinfo.spec,v 1.3 2008/04/22 16:03:07 snetram Exp $
+# $Id: smeserver-hwinfo.spec,v 1.10 2008/05/05 19:18:35 snetram Exp $
 # Authority: gnujpl
 # Name: Jean-Paul Leclère
 
 %define name smeserver-hwinfo
 %define version 1.0
-%define release 6
+%define release 10
 
 Summary: Harware info panel for SME Server.
 Name: %{name}
@@ -16,10 +16,15 @@ Source: %{name}-%{version}.tar.gz
 Patch0: smeserver-hwinfo-1.0-template.patch
 Patch1: smeserver-hwinfo-1.0-template.patch2
 Patch2: smeserver-hwinfo-1.0-locale-2008-04-22.patch
+Patch3: smeserver-hwinfo-1.0-http.patch
+Patch4: smeserver-hwinfo-1.0-add2general.patch
+Patch5: smeserver-hwinfo-1.0-locale-2008-05-05.patch
+Patch6: smeserver-hwinfo-1.0-locale-2008-05-21.patch
 BuildRequires: e-smith-devtools
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base lshw
+Requires: e-smith-formmagick >= 1.4.0-12
 Obsoletes: eos-hwinfo
 AutoReqProv: no
 
@@ -27,6 +32,18 @@ AutoReqProv: no
 smeserver-hwinfo adds panel providing informations about server harware configuration
  
 %changelog
+* Thu May 21 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-10
+- Apply 21 May 2008 locale patch
+
+* Mon May 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-9
+- Apply 5 May 2008 locale patch
+
+* Sat Apr 26 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-8
+- Add common <base> tags to e-smith-formmagick's general
+
+* Thu Apr 24 2008 Jean-Paul Leclere <jean-paul@leclere.org> 1.0-7
+- remove obsolete httpd templates fragments
+
 * Tue Apr 22 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-6
 - Added e-smith-devtools as build requirement for the createlinks script
 
@@ -55,6 +72,10 @@ smeserver-hwinfo adds panel providing in
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %pre