[BackupPC] resolve conflicts

[Bernard Johnson]

commit bb0d1c134c2c39ec1bba622b7a51dea61f3a3fe0
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Fri Jul 8 22:58:37 2011 -0600

    resolve conflicts

 BackupPC.spec |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/BackupPC.spec b/BackupPC.spec
index 7041a76..7e3391d 100644
--- a/BackupPC.spec
+++ b/BackupPC.spec
@@ -41,6 +41,9 @@ BuildRequires:  systemd-units
 # Unbundled libraries
 Requires:       perl(Net::FTP::AutoReconnect), perl(Net::FTP::RetrHandle)
 
+# Unbundled libraries
+Requires:       perl(Net::FTP::AutoReconnect), perl(Net::FTP::RetrHandle)
+
 Requires:       httpd
 Requires:       perl(File::RsyncP), perl(Compress::Zlib), perl(Archive::Zip)
 Requires:       perl-Time-modules, perl(XML::RSS)
@@ -321,6 +324,8 @@ fi
 - move sockets to /var/run (bz #719499)
 - add support for systemd starting at F16 (bz #699441)
 - patch to move pid dir under /var/run
+- minor spec cleanup
+- unbundle Net::FTP::*
 
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.0-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild