SOURCES: perl-File-Rsync-misc.patch - fixes to make rpm/spec happy

[agaran]

Author: agaran                       Date: Sun Jan 22 12:46:23 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixes to make rpm/spec happy

---- Files affected:
SOURCES:
   perl-File-Rsync-misc.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/perl-File-Rsync-misc.patch
diff -u SOURCES/perl-File-Rsync-misc.patch:1.1 SOURCES/perl-File-Rsync-misc.patch:1.2
--- SOURCES/perl-File-Rsync-misc.patch:1.1	Thu Jan  1 20:57:32 2004
+++ SOURCES/perl-File-Rsync-misc.patch	Sun Jan 22 13:46:18 2006
@@ -1,17 +1,24 @@
---- File-Rsync-0.32.old/Makefile.PL	2001-05-17 03:32:19.000000000 +0200
-+++ File-Rsync-0.32/Makefile.PL	2004-01-01 19:42:50.659170040 +0100
-@@ -18,7 +18,7 @@
+diff -Nur File-Rsync-0.42.ori/Makefile.PL File-Rsync-0.42.mod/Makefile.PL
+--- File-Rsync-0.42.ori/Makefile.PL	2005-06-25 00:02:32.000000000 +0200
++++ File-Rsync-0.42.mod/Makefile.PL	2006-01-22 13:43:33.000000000 +0100
+@@ -17,10 +17,10 @@
+       AUTHOR         => $AUTHOR,
        ABSTRACT       => $ABSTRACT,
-       PL_FILES       => { 'makepm.PL' => 'Config.pm' },
+       PREREQ_PM      => { 'Scalar::Util' => 0 },
+-      PL_FILES       => { 'makepm.PL' => 'config.pm' },
++      PL_FILES       => { 'makepm.PL' => 'Config.pm' },
        PM             => { 'Rsync.pm'  => '$(INST_LIB)/File/Rsync.pm',
--     			  'Config.pm' => '$(INST_ARCHLIB)/File/Rsync/Config.pm' },
+-     			  'config.pm' => '$(INST_ARCHLIB)/File/Rsync/Config.pm' },
 +     			  'Config.pm' => '$(INST_LIB)/File/Rsync/Config.pm' },
        dist           => { COMPRESS => 'gzip', SUFFIX => 'gz' },
-       realclean      => { FILES => 'Config.pm' },
+-      realclean      => { FILES => 'config.pm' },
++      realclean      => { FILES => 'Config.pm' },
  );
---- File-Rsync-0.32.old/makepm.PL	2001-05-11 05:12:17.000000000 +0200
-+++ File-Rsync-0.32/makepm.PL	2004-01-01 19:37:09.339058584 +0100
-@@ -20,11 +20,7 @@
+ 
+diff -Nur File-Rsync-0.42.ori/makepm.PL File-Rsync-0.42.mod/makepm.PL
+--- File-Rsync-0.42.ori/makepm.PL	2005-06-24 23:56:33.000000000 +0200
++++ File-Rsync-0.42.mod/makepm.PL	2006-01-22 13:42:09.000000000 +0100
+@@ -20,15 +20,15 @@
  (this is not recommended)).
  
  EOT
@@ -20,20 +27,18 @@
 -my $ans=<STDIN>;
 -chomp $ans;
 -$RSYNC=$ans || $RSYNC;
+-$RSYNC=~s/\\/\\\\/g;
+-$RSYNC=~s/\'/\\\'/g;
 +$RSYNC||='/usr/bin/rsync';
- $RSYNC=~s/\\/\\\\/g;
- $RSYNC=~s/\'/\\\'/g;
- open IN,'Config.in' or die "Cannot read Config.in: $!\n";
---- File-Rsync-0.32.old/Rsync.pm	2003-12-27 03:43:12.000000000 +0100
-+++ File-Rsync-0.32/Rsync.pm	2004-01-01 19:37:48.858050784 +0100
-@@ -35,8 +35,8 @@
- use File::Rsync;
- 
- $obj = File::Rsync->new( { archive => 1, compress => 1,
--         rsh => '/usr/local/bin/ssh',
--         'rsync-path' => '/usr/local/bin/rsync' } );
-+         rsh => '/usr/bin/ssh',
-+         'rsync-path' => '/usr/bin/rsync' } );
- 
- $obj->exec( { src => 'localdir', dest => 'rhost:remdir' } )
-          or warn "rsync failed\n";
++#print "Path to rsync [$RSYNC]: ";
++#my $ans=<STDIN>;
++#chomp $ans;
++#$RSYNC=$ans || $RSYNC;
++#$RSYNC=~s/\\/\\\\/g;
++#$RSYNC=~s/\'/\\\'/g;
+ open IN,'config.in' or die "Cannot read config.in: $!\n";
+-open OUT,'>config.pm' or die "Cannot write config.pm: $!\n";
++open OUT,'>Config.pm' or die "Cannot write Config.pm: $!\n";
+ while (<IN>) {
+    if (/^(\s*rsync_path\s*=>)/) { print OUT "$1 '$RSYNC',\n" }
+    else                                  { print OUT }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/perl-File-Rsync-misc.patch?r1=1.1&r2=1.2&f=u