--- rpms/e-smith-base/sme8/e-smith-base.spec 2010/11/30 19:58:45 1.124 +++ rpms/e-smith-base/sme8/e-smith-base.spec 2011/03/14 11:08:51 1.130 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.123 2010/11/30 17:03:44 slords Exp $ +# $Id: e-smith-base.spec,v 1.129 2011/03/14 10:36:05 snetram Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.2.0 -%define release 55 +%define release 60 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -53,6 +53,10 @@ Patch40: e-smith-base-5.2.0-supp-groups. Patch41: e-smith-base-5.2.0-fix_gpasswd_path.patch Patch42: e-smith-base-5.2.0-fix-gid.patch Patch43: e-smith-base-5.2.0-weak-updates.patch +Patch44: e-smith-base-5.2.0-apache_alias_for_www.patch +Patch45: e-smith-base-5.2.0-no-nic2.patch +Patch46: e-smith-base-5.2.0-list-only-write-enabled-backup-targets.patch +Patch47: e-smith-base-5.2.0-string-fix.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: mod_auth_external Requires: e-smith-lib >= 2.2.0-2 @@ -100,6 +104,24 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Mon Mar 14 2011 Jonathan Martens 5.2.0-60.sme +- Rework text changes in console screen in previous revision [SME: 5932] + +* Mon Mar 14 2011 Jonathan Martens 5.2.0-59.sme +- Only list backup targets that are writeable [SME: 5932] + +* Sun Mar 13 2011 Jonathan Martens 5.2.0-58.sme +- Revert admin password change through user-manager [SME: 3759] + +* Sun Mar 13 2011 Jonathan Martens 5.2.0-57.sme +- Allow admin password change through user-manager [SME: 3759] + +* Wed Mar 2 2011 Jonathan Martens 5.2.0-57.sme +- Handle no network interface scenario in console and bootstrap-console [SME: 6023] + +* Mon Dec 6 2010 Daniel Berteaud 5.2.0-56.sme +- change apache uid and gid so they become aliases for www [SME: 6425] + * Tue Nov 30 2010 Shad L. Lords 5.2.0-55.sme - Only remove dangling symlinks in weak-updates directories [SME: 6376] @@ -1529,6 +1551,10 @@ e-smith server and gateway software - ba %patch41 -p1 %patch42 -p1 %patch43 -p1 +%patch44 -p1 +%patch45 -p1 +%patch46 -p1 +%patch47 -p1 %pre if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]