--- rpms/e-smith-backup/sme7/e-smith-backup.spec 2008/08/01 17:39:23 1.4.2.11 +++ rpms/e-smith-backup/sme7/e-smith-backup.spec 2008/10/25 07:21:44 1.39 @@ -1,41 +1,30 @@ +# $Id: e-smith-backup.spec,v 1.38 2008/10/22 18:40:49 slords Exp $ + Summary: e-smith module to provide the backup panel %define name e-smith-backup Name: %{name} -%define version 1.14.0 -%define release 26 +%define version 2.0.0 +%define release 13 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 -Patch20: e-smith-backup-1.14.0-add2general.patch -Patch21: e-smith-backup-1.14.0-stderr.patch +Patch1: e-smith-backup-2.0.0-localise_fix.patch +Patch2: e-smith-backup-2.0.0-fixPleaseConfigure.patch +Patch3: e-smith-backup-2.0.0-restore_list.patch +Patch4: e-smith-backup-2.0.0-timeout.patch +Patch5: e-smith-backup-2.0.0-smbfs.patch +Patch6: e-smith-backup-2.0.0-mount_verify.patch +Patch7: e-smith-backup-2.0.0-nocompressogg.patch +Patch8: e-smith-backup-2.0.0-verbose.patch +Patch9: e-smith-backup-2.0.0-email.patch +Patch10: e-smith-backup-2.0.0-mount_usb.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-12 Requires: e-smith-lib >= 1.15.1-19 Requires: perl(Quota) Requires: perl(Unix::PasswdFile) @@ -45,37 +34,113 @@ Requires: perl(Locale::gettext) Requires: perl(Digest::MD5) Requires: perl(File::Copy) Requires: perl(esmith::I18N) +Requires: dar +Requires: e-smith-formmagick >= 1.4.0-12 %changelog -* Fri Aug 1 2008 Jonathan Martens 1.14.0-26 -- Fix too greedy removel of locale key CONFIGURE_TAPE_BACKUP [SME: 4469] +* Sat Oct 25 2008 Stephen Noble 2.0.0-13.sme +- correct mounting for usb disks [SME: 4695] + +* Wed Oct 22 2008 Shad L. Lords 2.0.0-12.sme +- Fix from address on email [SME: 4702] + +* Tue Oct 21 2008 Shad L. Lords 2.0.0-11.sme +- Fix patch to remove orig file [SME: 4700] +- Patch dar backup to be less verbose [SME: 4699] + +* Tue Oct 21 2008 Stephen Noble 2.0.0-10.sme +- no compression for ogg media files [SME: 4677] + +* Tue Oct 21 2008 Stephen Noble 2.0.0-8.sme +- replace defined list of directories to backup [SME: 4676] + +* Mon Oct 20 2008 Shad L. Lords 2.0.0-7.sme +- Fix already mounted check [SME: 4688] + +* Mon Oct 20 2008 Shad L. Lords 2.0.0-6.sme +- Remove obsolete smbfs backup method [SME: 4678] + +* Mon Oct 20 2008 Shad L. Lords 2.0.0-5.sme +- Use perl routines for timeout checking [SME: 4660] + +* Thu Oct 16 2008 Shad L. Lords 2.0.0-4.sme +- Make dar use defined list of directories to backup [SME: 4676] + +* Thu Oct 16 2008 Jonathan Martens 2.0.0-3.sme +- Correct translation of CONFIGURATION_TO_BE_DONE to be proper English [SME: 4669] + +* Thu Oct 9 2008 Shad L. Lords 2.0.0-2.sme +- Fix localization strings in backup panel [SME: 4650] + +* Tue Oct 7 2008 Shad L. Lords 2.0.0-1.sme +- Roll new stream to separate sme7/sme8 trees [SME: 4633] + +* Thu Aug 7 2008 Shad L. Lords 1.15.0-22 +- Localise status of workstation backup [SME: 4481] -* Mon Jul 28 2008 Jonathan Martens 1.14.0-25 -- Backport patch to add common tags to e-smith-formmagick's general [SME: 4286] +* Fri Aug 1 2008 Jonathan Martens 1.15.0-21 +- Fix too greedy removel of locale key CONFIGURE_TAPE_BACKUP [SME: 4469] -* Sat Jul 26 2008 Shad L. Lords 1.14.0-24 +* Sat Jul 26 2008 Shad L. Lords 1.15.0-20 +- Make full backups have priority over incremental [SME: 4395] + +* Sat Jul 26 2008 Shad L. Lords 1.15.0-19 - Fix redirect to stderr on check tape cronjob [SME: 4458] -* Mon Apr 28 2008 Jonathan Martens 1.14.0-23 +* Sun Jul 7 2008 Jonathan Martens 1.15.0-18 - Add common tags to e-smith-formmagick's general [SME: 4286] -* Tue Mar 25 2008 Shad L. Lords 1.14.0-22 -- Use correct patch for remove duplicates [SME: 3887] +* Sat May 31 2008 Gavin Weight 1.15.0-17 +- Fix Dar manager to redirect correctly in system call. [SME: 4304] + +* Mon May 26 2008 Gavin Weight 1.15.0-16 +- Fix Dar to expand correctly. [SME: 4304] + +* Sun Apr 27 2008 Jonathan Martens 1.15.0-15 +- Add common tags to e-smith-formmagick's general [SME: 4286] -* Tue Mar 25 2008 Shad L. Lords 1.14.0-21 +* Wed Apr 09 2008 Stephen Noble 1.15.0-14 +- Minor fix in translation of hours [SME: 4179] + +* Tue Mar 25 2008 Shad L. Lords 1.15.0-13 - Fix localization in restore routine [SME: 3989] -* Mon Mar 24 2008 Shad L. Lords 1.14.0-20 -- Fix patches to get rid of .orig files [SME: 4100] +* Sat Mar 07 2008 Stephen Noble 1.15.0-12 +- Remove
tag from error msg [SME: 3989] + +* Sat Mar 07 2008 Stephen Noble 1.15.0-11 +- Move/copy Backup_Desc to Backup_Desc_Dar for 1.15 rel [SME: 4024] + +* Wed Feb 13 2008 Stephen Noble 1.15.0-10 +- Remove tags now in general [SME: 3912] -* Mon Mar 24 2008 Shad L. Lords 1.14.0-19 -- Backport remove
from error msg. [SME: 3989] +* Sun Feb 10 2008 Stephen Noble 1.15.0-9 +- Remove duplicate entries [SME: 3887] -* Thu Feb 14 2008 Gavin Weight 1.14.0-18 -- Backport remove tags now in general. [SME: 3912] +* Thu Nov 29 2007 Gavin Weight 1.15.0-8 +- Fix restore files location path. [SME: 3593] -* Mon Feb 11 2008 Gavin Weight 1.14.0-17 -- Backport remove duplicates entries. [SME: 3887] +* Mon Nov 19 2007 Gavin Weight 1.15.0-7 +- Fix compression setting range (Thanks JPL) . [SME: 3560] + +* Fri Nov 09 2007 Gavin Weight 1.15.0-06 +- Enhancement to DAR code (Thanks JPL) . [SME: 3538] + +* Fri Oct 26 2007 Gavin Weight 1.15.0-05 +- Fix up DAR code to enable backup to complete. [SME: 3373] + +* 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] + +* Fri Sep 07 2007 Charlie Brady 1.15.0-03 +- Reformat new DAR code to match existing coding style. + +* Wed Sep 05 2007 Jean-Paul Leclere 1.15.0-02 +- Dar workstation backup patch + +* 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] @@ -1013,7 +1078,6 @@ e-smith server central backup administra %prep %setup -%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -1024,17 +1088,6 @@ e-smith server central backup administra %patch8 -p1 %patch9 -p1 %patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 %build /sbin/e-smith/buildtests 10e-smith-backup @@ -1053,6 +1106,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 @@ -1070,9 +1125,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