--- rpms/smeserver-sme7admin/contribs7/smeserver-sme7admin.spec	2009/03/02 23:40:38	1.1
+++ rpms/smeserver-sme7admin/contribs7/smeserver-sme7admin.spec	2009/03/05 19:08:58	1.6
@@ -1,29 +1,44 @@
+# $Id: smeserver-sme7admin.spec,v 1.5 2009/03/05 17:37:19 slords Exp $
+# Authority: vip-ire
+# Name: Daniel Berteaud
+
 Summary: Un module sme pour avoir des infos sur l'utilisation du serveur.
 %define name smeserver-sme7admin
 Name: %{name}
-%define version 1.1.0
-%define release 6
+%define version 1.1.1
+%define release 1
 Version: %{version}
-Release: %{release}
-Copyright: GPL
+Release: %{release}%{?dist}
+License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-#Patch0: %{name}-%{version}.patch.yyyymmddnn
-Packager: Landry Breuil <landry@firewall-services.com>
+Patch1: smeserver-sme6admin-1.1.1-toenglish.patch
+
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
-Requires: e-smith-base e-smith rrdtool-perl rrdtool hddtemp sysstat < 5.1 lm_sensors
+
+BuildRequires: e-smith-devtools
+BuildRequires: gettext
+
+Requires: e-smith-base
+Requires: rrdtool-perl
+Requires: rrdtool
+Requires: hddtemp
+Requires: sysstat < 5.1
+Requires: lm_sensors
+
 # lm_sensors est de base dans sme maintenant -> devrait pas y avoir de pb de deps
 AutoReqProv: no
 
-Patch0: smeserver-sme7admin-newrrd.patch
-Patch1: smeserver-sme7admin-0conf.patch
-Patch2: smeserver-sme7admin-fix_samba_service_name.patch
-Patch3: smeserver-sme7admin-alertForm.patch
-Patch4: smeserver-sme7admin-1.1.0-fix_userpanel_graph.patch
-Patch5: smeserver-sme6admin-1.1.0-remove_db_init_from_spec.patch
-
 %changelog
+* Thu Mar 5 2009 Daniel B. <daniel@firewall-services.com> 1.1.1-1.sme
+- Roll new version in prep for translation
+- Convert base strings to english
+
+* Tue Mar 03 2009 Daniel B. <daniel@firewall-services.com> 1.1.0-7
+- Split Requires in several lines
+- Add e-smith-devtools as a build dependency
+
 * Tue Feb 17 2009 Daniel B. <daniel@firewall-services.com> 1.1.0-6
 - Fixes in spec file
 - Fix links for graphs in userpanels
@@ -113,17 +128,19 @@ Il permet d'avoir un maximum d'informati
 
 %prep
 %setup
-%patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
 perl createlinks
 %{__mkdir_p} root/etc/e-smith/web/panels/manager/html/sme7admin
+%{__mkdir_p} root/usr/share/locale/en_US/LC_MESSAGES
+
+xgettext --from-code UTF-8 -F --no-wrap -L perl \
+        -o root/usr/share/locale/en_US/LC_MESSAGES/sme7admin.po \
+        root/etc/e-smith/web/functions/sme7admin \
+        root/usr/bin/sme7admind
 
+/sbin/e-smith/generate-lexicons
 
 %install
 rm -rf $RPM_BUILD_ROOT