--- rpms/smeserver-hwinfo/contribs7/smeserver-hwinfo.spec	2008/04/26 21:42:09	1.7
+++ 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.6 2008/04/26 14:56:46 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 8
+%define release 10
 
 Summary: Harware info panel for SME Server.
 Name: %{name}
@@ -17,11 +17,14 @@ Patch0: smeserver-hwinfo-1.0-template.pa
 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
+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
 
@@ -29,6 +32,12 @@ 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
 
@@ -65,6 +74,8 @@ smeserver-hwinfo adds panel providing in
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %pre