--- rpms/e-smith-base+ldap/sme7/e-smith-base+ldap.spec 2009/02/14 20:15:16 1.33 +++ rpms/e-smith-base+ldap/sme7/e-smith-base+ldap.spec 2009/11/23 18:54:28 1.39 @@ -1,10 +1,10 @@ -# $Id: e-smith-base+ldap.spec,v 1.32 2008/10/25 11:35:59 dungog Exp $ +# $Id: e-smith-base+ldap.spec,v 1.38 2009/11/06 12:34:12 snetram Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base+ldap Name: %{name} %define version 5.0.0 -%define release 5 +%define release 9 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -13,7 +13,11 @@ Source: %{name}-%{version}.tar.gz Patch1: e-smith-base+ldap-5.0.0-sys_accounts.patch Patch2: e-smith-base+ldap-5.0.0-sambaRole.patch Patch3: e-smith-base+ldap-5.0.0-smartd40.patch -Patch4: e-smith-base-5.0.0-usbRev70drive.patch +Patch4: e-smith-base+ldap-5.0.0-usbRev70drive.patch +Patch5: e-smith-base+ldap-5.2.0-ftp_auth.patch +Patch6: e-smith-base+ldap-5.0.0-straysymlink.patch +Patch7: e-smith-base+ldap-5.0.0-adapter-translation-fixes.patch +Patch8: e-smith-base+ldap-5.0.0-FixLocale_External.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 2.0.0-2 @@ -66,6 +70,18 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Mon Nov 23 2009 Gavin Weight 5.0.0-9.sme +- Add a dummy call so xgettext can pull translated $ifName in console configuration pages. [SME: 1189] + +* Fri Nov 6 2009 Jonathan Martens 5.0.0-8.sme +- Translate $ifName in console configuration pages [SME: 1189] + +* Sat Jun 6 2009 Shad L. Lords 5.0.0-7.sme +- Clean up stray symlinks in /lib/modules before depmod [SME: 5334] + +* Thu Mar 26 2009 Daniel B. 5.0.0-6.sme +- Set PersistentPasswd to off in proftpd [SME: 5103] + * Sat Feb 14 2009 Jonathan Martens 5.0.0-5.sme - Auto-mount USB REV70-drive as usbdisk [SME: 5006] @@ -1201,6 +1217,10 @@ e-smith server and gateway software - ba %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]