[BackupPC] - unbundle perl(Net::FTP::AutoReconnect) and perl(Net::FTP::RetrHandle) - remove old patch that is n

Bernard Johnson bjohnson at fedoraproject.org
Sat Jul 9 05:33:20 UTC 2011


commit 692236909eba2494e942a264cae6eb63f4212456
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Wed Jul 6 22:01:49 2011 -0600

    - unbundle perl(Net::FTP::AutoReconnect) and perl(Net::FTP::RetrHandle)
    - remove old patch that is no longer needed

 BackupPC.spec |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/BackupPC.spec b/BackupPC.spec
index fc39980..2e59676 100644
--- a/BackupPC.spec
+++ b/BackupPC.spec
@@ -16,10 +16,8 @@ Source2:        BackupPC.logrotate
 Source3:        BackupPC-README.fedora
 #A C wrapper to use since perl-suidperl is no longer provided
 Source4:        BackupPC_Admin.c
-Patch0:         BackupPC-TopDir_change.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# No longer noarch due to the C wrapper
-#BuildArch:      noarch
 
 BuildRequires:  /bin/cat
 BuildRequires:  /bin/df
@@ -32,6 +30,9 @@ BuildRequires:  %{_bindir}/split
 BuildRequires:  %{_bindir}/ssh
 BuildRequires:  perl(Compress::Zlib)
 
+# Unbundled libraries
+Requires:       perl(Net::FTP::AutoReconnect), perl(Net::FTP::RetrHandle)
+
 Requires:       httpd
 Requires:       perl(File::RsyncP)
 Requires:       perl(Compress::Zlib)
@@ -61,7 +62,6 @@ configurable and easy to install and maintain.
 %prep
 
 %setup -q
-%patch0 -p1
 
 sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl
 for f in ChangeLog doc/BackupPC.pod doc/BackupPC.html; do
@@ -108,6 +108,13 @@ EOF
 popd
 %endif
 
+# attempt to unbundle as much as possible
+for m in Net/FTP; do
+  rm -rf lib/$m
+  pwd; ls -l
+  sed -i "\@lib/$m at d" configure.pl 
+done
+
 %build
 gcc -o BackupPC_Admin BackupPC_Admin.c $RPM_OPT_FLAGS
 %if ! 0%{?without_selinux}
@@ -244,6 +251,8 @@ fi
 - minor spec cleanup
 - make samba dependency on actual files required to EL5 can use samba-client
   or samba3x-client (bz #667479)
+- unbundle perl(Net::FTP::AutoReconnect) and perl(Net::FTP::RetrHandle)
+- remove old patch that is no longer needed
 
 * 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


More information about the scm-commits mailing list