--- rpms/e-smith-domains/sme9/e-smith-domains.spec 2014/04/24 17:35:22 1.2 +++ rpms/e-smith-domains/sme9/e-smith-domains.spec 2015/07/11 17:19:25 1.3 @@ -1,10 +1,10 @@ -# $Id: e-smith-domains.spec,v 1.1 2013/02/06 21:28:17 slords Exp $ +# $Id: e-smith-domains.spec,v 1.2 2014/04/24 17:35:22 stephdl Exp $ Summary: e-smith server and gateway - domains module %define name e-smith-domains Name: %{name} %define version 2.4.0 -%define release 2 +%define release 3 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -13,6 +13,7 @@ Source: %{name}-%{version}.tar.xz BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch Patch0: e-smith-domains-2.4.0_add_domain_name_on_remove_page.patch +Patch1: e-smith-domains-2.4.0.bz8842.retrieve_name_and_description_in_locale.patch Requires: e-smith-base >= 4.13.15-76 Requires: perl(HTML::Tabulate) >= 0.23 Requires: e-smith-formmagick >= 1.4.0-12 @@ -26,8 +27,12 @@ AutoReqProv: no e-smith server and gateway software - domains module. %changelog +* Mon Jul 6 2015 stephane de Labrusse 2.4.0-3.sme +- display variable name in the server-manager +- $domainName, $domainDesc $domain [SME: 8842] + * Thu Apr 24 2014 stephane de Labrusse 2.4.0-2.sme -- Display a warning with the domain name before to remove it [SME : 8333] +- Display a warning with the domain name before to remove it [SME: 8333] * Thu Jan 31 2013 Shad L. Lords 2.4.0-1.sme - Roll new stream for sme9 @@ -218,6 +223,8 @@ e-smith server and gateway software - do %prep %setup %patch0 -p1 +%patch1 -p1 + %build LEXICONS=$(find root/etc/e-smith/web/{functions,panels/password/cgi-bin} \ -type f | grep -v CVS | grep -v pleasewait)