diff --git a/BackupPC-4.1.3-docfix.patch b/BackupPC-4.1.3-docfix.patch index cf65e4e..9edeb7a 100644 --- a/BackupPC-4.1.3-docfix.patch +++ b/BackupPC-4.1.3-docfix.patch @@ -1,15 +1,17 @@ ---- a/configure.pl -+++ b/configure.pl -@@ -950,7 +950,7 @@ sub DoInstall +Index: BackupPC-4.4.0/configure.pl +=================================================================== +--- BackupPC-4.4.0.orig/configure.pl ++++ BackupPC-4.4.0/configure.pl +@@ -946,7 +946,7 @@ sub DoInstall # Create install directories # foreach my $dir ( qw(bin -- share share/doc share/doc/BackupPC -+ doc - lib lib/BackupPC - lib/BackupPC/CGI - lib/BackupPC/Config -@@ -1086,13 +1086,13 @@ sub DoInstall +- share share/doc share/doc/BackupPC ++ doc + lib lib/BackupPC + lib/BackupPC/CGI + lib/BackupPC/Config +@@ -1074,13 +1074,13 @@ sub DoInstall print("Making Apache configuration file for suid-perl\n"); InstallFile("httpd/src/BackupPC.conf", "httpd/BackupPC.conf", 0644); @@ -26,14 +28,16 @@ } # # clean up old directory (ok if it quietly fails if there are other files in that directory) ---- a/lib/BackupPC/CGI/View.pm -+++ b/lib/BackupPC/CGI/View.pm -@@ -102,7 +102,7 @@ sub action - $file = $bpc->ConfDir() . "/hosts"; +Index: BackupPC-4.4.0/lib/BackupPC/CGI/View.pm +=================================================================== +--- BackupPC-4.4.0.orig/lib/BackupPC/CGI/View.pm ++++ BackupPC-4.4.0/lib/BackupPC/CGI/View.pm +@@ -104,7 +104,7 @@ sub action + $file = $bpc->ConfDir() . "/hosts"; $linkHosts = 1; } elsif ( $type eq "docs" ) { - $file = $bpc->InstallDir() . "/share/doc/BackupPC/BackupPC.html"; + $file = $bpc->InstallDir() . "/doc/BackupPC.html"; } elsif ( $host ne "" ) { if ( !defined($In{num}) ) { - # get the latest LOG file + diff --git a/BackupPC-no_delete.patch b/BackupPC-no_delete.patch deleted file mode 100644 index 79b37fd..0000000 --- a/BackupPC-no_delete.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/bin/BackupPC_dump -+++ b/bin/BackupPC_dump -@@ -1871,6 +1871,9 @@ sub BackupFullExpire - my $noDelete = $i + 1 < @$Backups ? $Backups->[$i+1]{noFill} : 0; - $noDelete = 0 if ( !$Backups[$i]{preV4} ); - -+ #Don't delete full backups that have '.save' in their root directory -+ $noDelete = 1 if -e $Dir . "/" . $Backups[$i]{num} . "/.save"; -+ - if ( !$noDelete && - ($fullKeepIdx >= @$fullKeepCnt - || $k > 0 diff --git a/BackupPC.spec b/BackupPC.spec index 454e8c8..be757fd 100644 --- a/BackupPC.spec +++ b/BackupPC.spec @@ -27,7 +27,6 @@ Source7: README.RHEL Source8: apache.users Patch0: BackupPC-4.1.3-docfix.patch -Patch1: BackupPC-no_delete.patch BuildRequires: gcc BuildRequires: perl-generators