--- rpms/e-smith-base/sme8/e-smith-base.spec 2007/07/03 02:55:13 1.6 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2007/12/24 17:39:33 1.21 @@ -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 63 +%define release 81 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -58,6 +58,20 @@ Patch47: e-smith-base-4.18.0-no_kmodule. Patch48: e-smith-base-4-18-0-MovePam_d_ftpTemplates.patch Patch49: e-smith-base-4.18.0-usbback_errcheck.patch Patch50: e-smith-base-4.18.0-devicechk.patch +Patch51: e-smith-base-4.18.0-devicechk.patch2 +Patch52: e-smith-base-4.18.0-conf_modules.patch +Patch53: e-smith-base-4.18.0-restoredev.patch2 +Patch54: e-smith-base-4.18.0-groups.pm.pod.patch +Patch55: e-smith-base-4.18.0-rename_apache2httpd.patch +Patch56: e-smith-base-4.18.0-remove_httpd__logrotate.patch +Patch57: e-smith-base-4.18.0-cert_regen.patch +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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 1.18.0-7 @@ -105,7 +119,61 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog -* Sun Jul 1 2007 Shad L. Lords 4.18.0-62 +* 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 +- Remove previous change, applied to wrong package. [SME: 3512] + +* Fri Nov 02 2007 Gavin Weight 4.18.0-74 +- Add WPAD feature for DHCP (Thanks Hector Perez). [SME: 3512] + +* Tue Oct 16 2007 Gavin Weight 4.18.0-73 +- Make non-Removable pseudonyms point to admin when reassigned. [SME: 2214] + +* Sun Oct 14 2007 Gavin Weight 4.18.0-72 +- Adjust success text when changing admin password. [SME: 2442] + +* Thu Oct 11 2007 Charlie Brady 4.18.0-71 +- Fix comparison of expected to actual SSL cert data. Also change + truncation point for email address from 40 chars to 64. [SME: 1736]. + [Note that -70 was inadvertently skipped.] + +* Tue Sep 11 2007 Gavin Weight 4.18.0-69 +- Move httpd logrotate.d directory to e-smith-apache. [SME: 3380] + +* Tue Sep 11 2007 Gavin Weight 4.18.0-68 +- Rename in logrotate.d directory apache to httpd. [SME: 3380] + +* Fri Sep 07 2007 Charlie Brady 4.18.0-67 +- Fix pod in groups.pm file. [SME: 3379] + +* Wed Aug 22 2007 Charlie Brady 4.18.0-66 +- Relax restrictions on restore devices, to allow CDR and DVDR. + [SME: 3126] + +* Fri Aug 03 2007 Charlie Brady 4.18.0-65 +- Ensure that depmod is run for all installed kernels. [SME: 3235] + +* Wed Jul 04 2007 Charlie Brady 4.18.0-64 +- Really really clear devices variable [SME: 3116] + +* Sun Jul 1 2007 Shad L. Lords 4.18.0-63 - Really clear devices variable [SME: 3116] * Sun Jul 1 2007 Shad L. Lords 4.18.0-62 @@ -1159,6 +1227,20 @@ e-smith server and gateway software - ba %patch48 -p1 %patch49 -p1 %patch50 -p1 +%patch51 -p1 +%patch52 -p1 +%patch53 -p1 +%patch54 -p1 +%patch55 -p1 +%patch56 -p1 +%patch57 -p1 +%patch58 -p1 +%patch59 -p1 +%patch60 -p1 +%patch61 -p1 +%patch62 -p1 +%patch63 -p1 +%patch64 -p1 rm -rf root/etc/e-smith/db/configuration/defaults/httpd-admin rm -rf root/etc/e-smith/templates/etc/identd.masq @@ -1230,7 +1312,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