rpms/BackupPC/devel BackupPC-TopDir_change.patch, NONE, 1.1 BackupPC.spec, 1.8, 1.9

[Johan Cwiklinski]

Author: trasher

Update of /cvs/extras/rpms/BackupPC/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14342

Modified Files:
	BackupPC.spec 
Added Files:
	BackupPC-TopDir_change.patch 
Log Message:
Fix TopDir change (bug #473944)


BackupPC-TopDir_change.patch:

--- NEW FILE BackupPC-TopDir_change.patch ---
diff -up BackupPC-3.1.0/lib/BackupPC/Lib.pm.patch BackupPC-3.1.0/lib/BackupPC/Lib.pm
--- BackupPC-3.1.0/lib/BackupPC/Lib.pm.patch	2009-04-10 17:57:04.000000000 +0200
+++ BackupPC-3.1.0/lib/BackupPC/Lib.pm	2009-04-10 17:57:57.000000000 +0200
@@ -152,8 +152,6 @@ sub new
     # Clean up %ENV and setup other variables.
     #
     delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
-    $bpc->{PoolDir}  = "$bpc->{TopDir}/pool";
-    $bpc->{CPoolDir} = "$bpc->{TopDir}/cpool";
     if ( defined(my $error = $bpc->ConfigRead()) ) {
         print(STDERR $error, "\n");
         return;
@@ -167,6 +165,8 @@ sub new
         $paths->{$dir} = $bpc->{$dir} = $bpc->{Conf}{$dir};
     }
     $bpc->{storage}->setPaths($paths);
+    $bpc->{PoolDir}  = "$bpc->{TopDir}/pool";
+    $bpc->{CPoolDir} = "$bpc->{TopDir}/cpool";
 
     #
     # Verify we are running as the correct user


Index: BackupPC.spec
===================================================================
RCS file: /cvs/extras/rpms/BackupPC/devel/BackupPC.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BackupPC.spec	23 Feb 2009 20:01:26 -0000	1.8
+++ BackupPC.spec	10 Apr 2009 16:04:54 -0000	1.9
@@ -6,7 +6,7 @@
 
 Name:           BackupPC
 Version:        3.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        High-performance backup system
 
 Group:          Applications/System
@@ -16,6 +16,7 @@
 Source1:        BackupPC.htaccess
 Source2:        BackupPC.logrotate
 Source3:        BackupPC-README.fedora
+Patch0:         BackupPC-TopDir_change.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -56,6 +57,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl
 iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.utf && mv ChangeLog.utf ChangeLog
 pushd doc
@@ -226,6 +228,9 @@
 %endif
 
 %changelog
+* Fri Apr 10 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-5
+- Fix TopDir change (bug #473944)
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild