--- rpms/e-smith-backup/sme9/e-smith-backup.spec 2014/04/25 00:33:39 1.37 +++ rpms/e-smith-backup/sme9/e-smith-backup.spec 2015/02/02 18:38:46 1.42 @@ -1,10 +1,10 @@ -# $Id: e-smith-backup.spec,v 1.36 2014/04/24 05:27:50 wellsi Exp $ +# $Id: e-smith-backup.spec,v 1.41 2015/01/10 00:35:52 stephdl Exp $ Summary: e-smith module to provide the backup panel %define name e-smith-backup Name: %{name} %define version 2.4.0 -%define release 36 +%define release 41 Version: %{version} Release: %{release}%{?dist} License: Artistic @@ -47,6 +47,9 @@ Patch34: e-smith-backup-2.4.0-workstatio Patch35: e-smith-backup-2.4.0-workstation-allowMounted3.patch Patch36: e-smith-backup-2.4.0-workstation-asecu.patch Patch37: e-smith-backup-2.4.0-workstation-mkdir.patch +Patch38: e-smith-backup-2.4.0-workstation-correctmount.patch +Patch39: e-smith-backup-2.4.0-dont_remove_apache_group.patch +Patch40: e-smith-backup-2.4.0.change_method_checkMount_to_findmnt.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.11.0-03 BuildRequires: gettext @@ -55,7 +58,8 @@ Requires: e-smith-base Requires: e-smith-lib >= 1.15.1-19 Requires: perl(Quota) Requires: perl(Unix::PasswdFile) -Requires: perl(Unix::GroupFile) +Requires: perl(Crypt::PasswdMD5) +Requires: perl(Passwd::Unix) Requires: perl(POSIX) Requires: perl(Locale::gettext) Requires: perl(Digest::MD5) @@ -64,8 +68,23 @@ Requires: perl(esmith::I18N) Requires: dar Requires: cifs-utils Requires: e-smith-formmagick >= 1.4.0-12 +Requires: nfs-utils %changelog +* Mon Feb 2 2015 stephane de Labrusse 2.4.0-41.sme +- Change the sub checkMount() to findmnt +- Ian Wells + +* Fri Jan 9 2015 stephane de Labrusse 2.4.0-40.sme +- Add requires nfs-utils [SME: 8479] +- the nfs service is neither started or allowed to start + +* Sun Nov 2 2014 Daniel Berteaud 2.4.0-38.sme +- Don't remove the apache group during restore [SME: 8549] + +* Sat Apr 26 2014 Ian Wells 2.4.0-37.sme +- Workstation Backup, fix regression in mounting backup share [SME: 8144] + * Thu Apr 24 2014 Ian Wells 2.4.0-36.sme - Workstation Backup, do not create folder in / [SME: 8347] @@ -1417,6 +1436,9 @@ e-smith server central backup administra %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 +%patch40 -p1 %build /sbin/e-smith/buildtests 10e-smith-backup