--- rpms/smeserver-hwinfo/contribs7/smeserver-hwinfo.spec	2008/04/21 17:25:59	1.1
+++ rpms/smeserver-hwinfo/contribs7/smeserver-hwinfo.spec	2008/07/01 20:02:58	1.12
@@ -1,10 +1,10 @@
-# $Id: smeserver-hwinfo-1.0.spec,v 1.2 2008/04/06 15:21:11 slords Exp $
+# $Id: smeserver-hwinfo.spec,v 1.11 2008/05/21 20:15:37 snetram Exp $
 # Authority: gnujpl
 # Name: Jean-Paul Leclère
 
 %define name smeserver-hwinfo
 %define version 1.0
-%define release 3
+%define release 11
 
 Summary: Harware info panel for SME Server.
 Name: %{name}
@@ -15,9 +15,17 @@ Group: System Environment/Daemons
 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
+Patch7: smeserver-hwinfo-1.0-locale-2008-07-01.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
 
@@ -25,6 +33,29 @@ AutoReqProv: no
 smeserver-hwinfo adds panel providing informations about server harware configuration
  
 %changelog
+* Tue Jul 1 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-11
+- Apply 1 July 2008 locale patch
+
+* 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
+
+* Tue Apr 22 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-5
+- Trying to fix creatlinks build error
+
+* Tue Apr 22 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.0-4
+- Added 22 April 2008 locale patch
 
 * Fri Apr 4 2008 Jean-Paul Leclere <jean-paul@leclere.org>
 - [1.0-3]
@@ -39,19 +70,24 @@ smeserver-hwinfo adds panel providing in
 - [1.0-1]
 - port from Free-EOS eos-hwinfo, as a new panel in server-manager
 
-
 %prep
 %setup
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %pre
 
 %post
 
 %build
-./createlinks 
+perl createlinks 
 
 %install
 rm -rf $RPM_BUILD_ROOT