--- rpms/e-smith-base/sme8/e-smith-base.spec 2008/03/12 16:08:04 1.32 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2008/03/24 19:14:26 1.39 @@ -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 100 +%define release 104 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -90,6 +90,10 @@ Patch79: e-smith-base-4.18.0-rmDuplicate 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 +Patch85: e-smith-base-4.18.0-gettextConsole.patch +Patch86: e-smith-base-4.18.0-rmPleasewait.patch2 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 1.18.0-19 @@ -137,7 +141,19 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog -* Wed Mar 12 2008 Shad L. Lords 4.18.0-99 +* Mon Mar 24 2008 Shad L. Lords 4.18.0-104 +- Finish removing pleasewait [SME: 126] + +* Tue Mar 18 2008 Shad L. Lords 4.18.0-103 +- Add gettext to console titles. [SME: 4089] + +* Sat Mar 15 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 @@ -1335,6 +1351,10 @@ e-smith server and gateway software - ba %patch80 -p1 %patch81 -p1 %patch82 -p1 +%patch83 -p1 +%patch84 -p1 +%patch85 -p1 +%patch86 -p1 rm -rf root/etc/e-smith/db/configuration/defaults/httpd-admin rm -rf root/etc/e-smith/templates/etc/identd.masq @@ -1383,7 +1403,7 @@ echo "disabled" > root/etc/e-smith/db/c %endif LEXICONS=$(find root/etc/e-smith/web/{functions,panels/password/cgi-bin} \ - -type f | grep -v CVS | grep -v pleasewait) + -type f | grep -v CVS) for lexicon in $LEXICONS do