--- rpms/e-smith-base/sme8/e-smith-base.spec 2014/03/15 21:35:09 1.165 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2015/01/16 14:02:30 1.169 @@ -1,16 +1,19 @@ -# $Id: e-smith-base.spec,v 1.164 2014/03/10 13:25:54 burnat Exp $ +# $Id: e-smith-base.spec,v 1.168 2015/01/11 21:46:53 stephdl Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.2.0 -%define release 91 +%define release 94 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: e-smith-base-5.2.0.90.tar.gz Patch1: e-smith-base-5.2.0-reset_ibay_default_type.patch +Patch2: e-smith-base-5.2.0_added_verification_of_pptp_clients_against_dhcp.patch +Patch3: e-smith-base-5.2.0_console_verification_dhcp_vs_pptp.patch +Patch4: e-smith-base-5.2.0-default_to_no_on_quit_console_app.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 2.2.0-2 @@ -58,6 +61,18 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Sun Jan 11 2015 Stephane de Labrusse 5.2.0-94.sme +- When quiting the console app with unsaved changes set the default selected +- answer to NO, Hsing-Foo Wang [SME: 8794] + +* Wed Apr 23 2014 stephane de Labrusse 5.2.0-93.sme +- Add a verification in the console of number of pptp clients against ip allowed in dhcpd +- [SME: 8298] + +* Sun Apr 6 2014 stephane de Labrusse 5.2.0-92.sme +- Add a verification in remoteaccess panel of number of pptp clients against ip allowed in dhcpd +- [SME: 8298] + * Mon Mar 10 2014 Chris Burnat 5.2.0-91.sme - Reset primary ibay default type [SME: 8267] @@ -1558,7 +1573,9 @@ e-smith server and gateway software - ba %prep %setup %patch1 -p1 - +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ] then