--- rpms/e-smith-backup/sme8/e-smith-backup.spec 2008/03/26 19:46:42 1.4.2.6 +++ rpms/e-smith-backup/sme8/e-smith-backup.spec 2007/09/17 17:48:55 1.6 @@ -1,39 +1,21 @@ Summary: e-smith module to provide the backup panel %define name e-smith-backup Name: %{name} -%define version 1.14.0 -%define release 22 +%define version 1.15.0 +%define release 04 Version: %{version} Release: %{release}%{?dist} License: Artistic Group: Networking/Daemons Source: %{name}-%{version}.tar.gz -Patch0: e-smith-backup-1.14.0-DesktopBackupWarning.patch -Patch1: e-smith-backup-1.14.0-DesktopBackupWarning.patch2 -Patch2: e-smith-backup-1.14.0-Crontab.patch -Patch3: e-smith-backup-1.14.0-Crontab.patch2 -Patch4: e-smith-backup-1.14.0-DesktopBackupWarning.patch3 -Patch5: e-smith-backup-1.14.0-eject.patch -Patch6: e-smith-backup-1.14.0-tapeactions.patch -Patch7: e-smith-backup-1.14.0-backuptype.patch -Patch8: e-smith-backup-1.14.0-eject.patch2 -Patch9: e-smith-backup-1.14.0-backuptype.patch2 -Patch10: e-smith-backup-1.14.0-restorefromdisk.patch -Patch11: e-smith-backup-1.14.0-RestoreMachineAccountGroups.patch -Patch12: e-smith-backup-1.14.0-reminderemail.patch -Patch13: e-smith-backup-1.14.0-backuptype.patch3 -Patch14: e-smith-backup-1.14.0-proxyenv.patch -Patch15: e-smith-backup-1.14.0-bklistexist.patch -Patch16: e-smith-backup-1.14.0-rmLexDuplicates.patch -Patch17: e-smith-backup-1.14.0-tags2general.patch -Patch18: e-smith-backup-1.14.0-brFix.patch -Patch19: e-smith-backup-1.14.0-fixerrmsg.patch +Patch0: e-smith-backup-1.15.0-DarWorkstation.patch +Patch1: e-smith-backup-1.15.0-reformat.patch +Patch2: e-smith-backup-1.15.0-no_desktop_verify_restore.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.11.0-03 BuildRequires: gettext BuildArchitectures: noarch Requires: e-smith-base -Requires: e-smith-formmagick >= 1.4.0-9 Requires: e-smith-lib >= 1.15.1-19 Requires: perl(Quota) Requires: perl(Unix::PasswdFile) @@ -43,25 +25,21 @@ Requires: perl(Locale::gettext) Requires: perl(Digest::MD5) Requires: perl(File::Copy) Requires: perl(esmith::I18N) +Requires: dar %changelog -* Tue Mar 25 2008 Shad L. Lords 1.14.0-22 -- Use correct patch for remove duplicates [SME: 3887] +* Tue Sep 11 2007 Charlie Brady 1.15.0-04 +- Remove desktop verify and desktop restore features. Note that + lexicon entries have not been removed. [SME: 3372] -* Tue Mar 25 2008 Shad L. Lords 1.14.0-21 -- Fix localization in restore routine [SME: 3989] +* Fri Sep 07 2007 Charlie Brady 1.15.0-03 +- Reformat new DAR code to match existing coding style. -* Mon Mar 24 2008 Shad L. Lords 1.14.0-20 -- Fix patches to get rid of .orig files [SME: 4100] +* Wed Sep 05 2007 Jean-Paul Leclere 1.15.0-02 +- Dar workstation backup patch -* Mon Mar 24 2008 Shad L. Lords 1.14.0-19 -- Backport remove
from error msg. [SME: 3989] - -* Thu Feb 14 2008 Gavin Weight 1.14.0-18 -- Backport remove tags now in general. [SME: 3912] - -* Mon Feb 11 2008 Gavin Weight 1.14.0-17 -- Backport remove duplicates entries. [SME: 3887] +* Wed Sep 05 2007 Charlie Brady 1.15.0-01 +- Roll new development version. * Sun Jul 01 2007 Shad L. Lords 1.14.0-16 - Remove files/dirs that don't exist from the backup list [SME: 3115] @@ -1002,23 +980,6 @@ e-smith server central backup administra %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 %build /sbin/e-smith/buildtests 10e-smith-backup @@ -1037,6 +998,8 @@ mkdir -p root/var/cache/e-smith/restore mkdir -p root/var/cache/e-smith/restore/etc mkdir -p root/var/cache/e-smith/restore/etc/samba mkdir -p root/etc/e-smith/db/backups +mkdir -p root/etc/dar +mkdir -p root/mnt/smb %install rm -rf $RPM_BUILD_ROOT @@ -1054,9 +1017,6 @@ rm -rf $RPM_BUILD_ROOT %pre %preun %post -/bin/rm -f /sbin/e-smith/backup -/bin/rm -f /etc/cron.d/backup - %postun %files -f %{name}-%{version}-%{release}-filelist