--- rpms/e-smith-base/sme8/e-smith-base.spec 2007/11/11 15:05:47 1.15 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2008/03/15 08:23:20 1.36 @@ -2,7 +2,7 @@ Summary: e-smith server and gateway - ba %define name e-smith-base Name: %{name} %define version 4.18.0 -%define release 76 +%define release 102 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -68,11 +68,35 @@ Patch57: e-smith-base-4.18.0-cert_regen. Patch58: e-smith-base-4.18.0-useracc_text_adjust.patch Patch59: e-smith-base-4.18.0-non_Removable_pseudonyms.patch Patch60: e-smith-base-4.18.0-delete_forwarder.patch +Patch61: e-smith-base-4.18.0-part_size.patch +Patch62: e-smith-base-4.18.0-passwdlock.patch +Patch63: e-smith-base-4.18.0-smartd.patch +Patch64: e-smith-base-4.18.0-smartdtemplates2expand.patch +Patch65: e-smith-base-4.18.0-consoleValidatePassword.patch +Patch66: e-smith-base-4.18.0-backupstatus.patch +Patch67: e-smith-base-4.18.0-usb-revDrive.patch +Patch68: e-smith-base-4.18.0-consoleValidateFirst.patch +Patch69: e-smith-base-4.18.0-MTU.patch +Patch70: e-smith-base-4.18.0-adminIsNotRoot.patch +Patch71: e-smith-base-4.18.0-noMTU.patch +Patch72: e-smith-base-4.18.0-ROUTER_DESC.patch +Patch73: e-smith-base-4.18.0-rmDuplicates.patch +Patch74: e-smith-base-4.18.0-tags2general.patch +Patch75: e-smith-base-4.18.0-useracc_single_char-fix.patch +Patch76: e-smith-base-4.18.0-gettextErrors.patch +Patch77: e-smith-base-4.18.0-rmPleasewait.patch +Patch78: e-smith-base-4.18.0-gettextErrors.patch2 +Patch79: e-smith-base-4.18.0-rmDuplicates.patch2 +Patch80: e-smith-base-4.18.0-gettextStrings.patch2 +Patch81: e-smith-base-4.18.0-customDynDNS.patch +Patch82: e-smith-base-4.18.0-fixSAVE.patch +Patch83: e-smith-base-4.18.0-test_FORM_TITLE.patch +Patch84: e-smith-base-4.18.0-translationfix.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external -Requires: e-smith-lib >= 1.18.0-7 +Requires: e-smith-lib >= 1.18.0-19 Requires: server-manager-images, server-manager -Requires: e-smith-formmagick >= 0.2.0 +Requires: e-smith-formmagick >= 1.4.0-9 Requires: initscripts >= 6.67-1es17 Requires: e-smith-daemontools >= 1.7.1-04 Requires: perl(Locale::gettext) @@ -115,7 +139,86 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog -* Sun Nov 09 2007 Gavin Weight 4.18.0-76 +* Sat Mar 10 2008 Stephen Noble 4.18.0-102 +- Minor translation fixes [SME: 4058] [SME: 4059] + +* Wed Mar 12 2008 Shad L. Lords 4.18.0-101 +- Remove tests for removed FORM_TITLE's [SME: 4050] + +* Wed Mar 12 2008 Shad L. Lords 4.18.0-100 +- Cleanup SAVE/ADD tag mixup [SME: 4045] + +* Sat Mar 10 2008 Shad L. Lords 4.18-99 +- Fix dyndns custom gettext [SME: 4032] + +* Sat Mar 07 2008 Stephen Noble 4.18-98 +- revised gettext messages [SME: 631] + +* Sat Mar 07 2008 Stephen Noble 4.18-97 +- gettext messages [SME: 631] + +* Sat Mar 07 2008 Stephen Noble 4.18-96 +- remove duplicate system password has been changed [SME: 3974] + +* Sat Mar 07 2008 Stephen Noble 4.18-95 +- EthernetAssign shouldn't be translated [SME: 3947] + +* Sun Feb 17 2008 Stephen Noble 4.18-94 +- Remove pleasewait function [SME: 126] + +* Sun Feb 17 2008 Stephen Noble 4.18-93 +- fix gettext formatting in three files [SME: 3938] + +* Wed Feb 13 2008 chris burnat 4.18-92 +- Fix creation of usernames and pseudonyms with one character +- [SME: 2451] + +* Wed Feb 13 2008 Stephen Noble 4.18-91 +- Remove tags now in general [SME: 3911] + +* Sun Feb 10 2008 Stephen Noble 4.18-90 +- Remove duplicate entries [SME: 3894] + +* Sat Feb 09 2008 Stephen Noble 4.18-89 +- remove unused ROUTER_DESC token from lexicon [SME: 3879] + +* Sat Jan 12 2008 Shad L. Lords 4.18-88 +- remove default of 1400 MTU for interfaces [SME: 549] + +* Wed Jan 09 2008 Stephen Noble 4.18-87 +- db prop to dissociate admin password from root in useraccounts.pm [SME: 3117] + +* Wed Jan 09 2008 Stephen Noble 4.18-86 +- pptp connections setting mtu/mru > 1400 [SME: 549] + +* Tue Jan 08 2008 Stephen Noble 4.18-85 +- console to strength validate password choice on first entry [SME: 3131] + +* Tue Jan 08 2008 Stephen Noble 4.18-84 +- Auto-mount USB REV-drive as usbdisk [SME: 2972] + +* Sun Jan 06 2008 Stephen Noble 4.18-83 +- ignore error returns from tar [SME: 3127] + +* Sun Jan 06 2008 Stephen Noble 4.18-82 +- Use esmith::util::validatePassword on console [SME: 2173] + +* Mon Dec 24 2007 Gavin Weight 4.18.0-81 +- Link smartd.conf to bootstrap-save-console and console-save. [SME: 1445] + +* Mon Dec 24 2007 Stephen Noble 4.18-80 +- Add smartd as a disabled service with template [SME: 1445] + +* Sun Dec 16 2007 Shad L. Lords 4.18.0-79 +- Lock user accounts with usermod instead of passwd [SME: 3595] + +* Sun Dec 16 2007 Gavin Weight 4.18.0-78 +- Add symlink to fr-fr locale. [SME: 3648] + +* Mon Nov 12 2007 Shad L. Lords 4.18.0-77 +- Add fix for varying partition sizes in add_raid [SME: 3547] + +* Sun Nov 11 2007 Gavin Weight 4.18.0-76 - Fix removal of Corporate DNS from console. [SME: 3532] * Fri Nov 02 2007 Gavin Weight 4.18.0-75 @@ -1218,6 +1321,30 @@ e-smith server and gateway software - ba %patch58 -p1 %patch59 -p1 %patch60 -p1 +%patch61 -p1 +%patch62 -p1 +%patch63 -p1 +%patch64 -p1 +%patch65 -p1 +%patch66 -p1 +%patch67 -p1 +%patch68 -p1 +%patch69 -p1 +%patch70 -p1 +%patch71 -p1 +%patch72 -p1 +%patch73 -p1 +%patch74 -p1 +%patch75 -p1 +%patch76 -p1 +%patch77 -p1 +%patch78 -p1 +%patch79 -p1 +%patch80 -p1 +%patch81 -p1 +%patch82 -p1 +%patch83 -p1 +%patch84 -p1 rm -rf root/etc/e-smith/db/configuration/defaults/httpd-admin rm -rf root/etc/e-smith/templates/etc/identd.masq @@ -1289,7 +1416,8 @@ xgettext -o root/usr/share/locale/en_US/ mkdir -p root/etc/e-smith/locale # Make the fr-ca link in %pre to ease upgrades -# ln -s fr root/etc/e-smith/locale/fr-ca +# ln -s fr root/etc/e-smith/locale/fr-ca +ln -s fr root/etc/e-smith/locale/fr-fr ln -s en-us root/etc/e-smith/locale/en ln -s en-us root/etc/e-smith/locale/en-au ln -s en-us root/etc/e-smith/locale/en-gb