Hello community, here is the log from the commit of package perl-File-Rsync for openSUSE:Factory checked in at 2015-04-25 09:52:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-File-Rsync (Old) and /work/SRC/openSUSE:Factory/.perl-File-Rsync.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-File-Rsync" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-File-Rsync/perl-File-Rsync.changes 2011-11-21 12:40:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-File-Rsync.new/perl-File-Rsync.changes 2015-04-25 11:23:02.000000000 +0200 @@ -1,0 +2,8 @@ +Sat Dec 27 22:26:04 UTC 2014 - l...@linux-schulserver.de + +- update to 0.45: + + removed 'use File::Rsync::Config', oops + + long overdue fix for automated builds, removed prompt for + rsync path to use PATH enviroment instead + +------------------------------------------------------------------- Old: ---- File-Rsync-0.43.tar.gz New: ---- File-Rsync-0.45.tar.gz cpanspec.yml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-File-Rsync.spec ++++++ --- /var/tmp/diff_new_pack.1r9wat/_old 2015-04-25 11:23:02.000000000 +0200 +++ /var/tmp/diff_new_pack.1r9wat/_new 2015-04-25 11:23:02.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-File-Rsync # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,54 +15,49 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: perl-File-Rsync +Version: 0.45 +Release: 0 %define cpan_name File-Rsync -Summary: Perl module interface to rsync -Url: http://search.cpan.org/perldoc?File::Rsync +Summary: Perl Module Interface to Rsync(1) F<Http://Rsync.Samba.Org/Rsync/> +License: GPL-1.0+ or Artistic-1.0 Group: Development/Libraries/Perl -License: Artistic-1.0 -Version: 0.43 -Release: 2 -Source: %{cpan_name}-%{version}.tar.gz +Url: http://search.cpan.org/dist/File-Rsync/ +Source0: http://www.cpan.org/authors/id/L/LE/LEAKIN/%{cpan_name}-%{version}.tar.gz +Source1: cpanspec.yml +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: perl BuildRequires: perl-macros +%{perl_requires} +# MANUAL BEGIN BuildRequires: rsync Requires: rsync -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{perl_requires} +# MANUAL END %description -Perl Convenience wrapper for the rsync(1) program. Written for rsync-2.3.2 and -updated for rsync-2.6.0 but should perform properly with most recent versions. - -Author: -------- - Lee Eakin <lea...@dfw.nostrum.com> - +Perl Convenience wrapper for the rsync(1) program. Written for +_rsync-2.3.2_ and updated for _rsync-2.6.0_ but should perform properly +with most recent versions. %prep -%setup -n %{cpan_name}-%{version} -sed -i "s|/usr/local/bin/rsync|/usr/bin/rsync|" config.in +%setup -q -n %{cpan_name}-%{version} %build -perl Makefile.PL -make %{?jobs:-j%jobs} +%{__perl} Makefile.PL INSTALLDIRS=vendor +%{__make} %{?_smp_mflags} %check -make test +%{__make} test %install %perl_make_install %perl_process_packlist %perl_gen_filelist -%clean -rm -rf %{buildroot} - %files -f %{name}.files -%defattr(-, root, root) -%doc Changelog README MANIFEST TODO +%defattr(-,root,root,755) +%doc Changelog README TODO %changelog ++++++ File-Rsync-0.43.tar.gz -> File-Rsync-0.45.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-Rsync-0.43/Changelog new/File-Rsync-0.45/Changelog --- old/File-Rsync-0.43/Changelog 2009-08-18 18:20:25.000000000 +0200 +++ new/File-Rsync-0.45/Changelog 2014-11-07 15:46:35.000000000 +0100 @@ -1,3 +1,12 @@ +Fri Nov 7 08:45:42 CST 2014 ( leakin at dfw dot nostrum dot com ) + + * version 0.45: removed 'use File::Rsync::Config', oops + +Thu Nov 6 10:03:01 CST 2014 ( leakin at dfw dot nostrum dot com ) + + * version 0.44: long overdue fix for automated builds, removed + prompt for rsync path to use PATH enviroment instead. + Tue Aug 18 10:56:10 CDT 2009 ( leakin at dfw dot nostrum dot com ) * version 0.43: Gavin Carr ( gavin at openfusion dot com dot au ) @@ -263,7 +272,7 @@ use File::Rsync;$rs=File::Rsync->new(srchost => 'localhost:'); print $rs->list; will list available modules on the local daemon. - + Tue Nov 28 10:22:50 CST 2000 Lee Eakin ( leakin at dfw dot nostrum dot com ) * version 0.15: After more thought and discussion with Boris we decided @@ -372,7 +381,7 @@ increased flexibility including the ability to turn off boolean flags, and to build your own include or exclude list as an array and pass a reference to the array to the module. The same can be done for source - paths. + paths. * removed leading double-dashes from the option keys. It is easier to add them in the parser for command-line style than to remove them for diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-Rsync-0.43/MANIFEST new/File-Rsync-0.45/MANIFEST --- old/File-Rsync-0.43/MANIFEST 2008-12-17 23:43:43.000000000 +0100 +++ new/File-Rsync-0.45/MANIFEST 2014-11-07 15:59:19.000000000 +0100 @@ -1,10 +1,9 @@ Changelog -config.in MANIFEST Makefile.PL README Rsync.pm TODO -makepm.PL test.pl META.yml +META.json Module JSON meta-data (added by MakeMaker) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-Rsync-0.43/META.json new/File-Rsync-0.45/META.json --- old/File-Rsync-0.43/META.json 1970-01-01 01:00:00.000000000 +0100 +++ new/File-Rsync-0.45/META.json 2014-11-07 15:59:18.000000000 +0100 @@ -0,0 +1,41 @@ +{ + "abstract" : "Wrapper module for rsync(1) http://rsync.samba.org/";, + "author" : [ + "Lee Eakin <lea...@dfw.nostrum.com>" + ], + "dynamic_config" : 1, + "generated_by" : "ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.142690", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec";, + "version" : "2" + }, + "name" : "File-Rsync", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : "0" + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "0" + } + }, + "runtime" : { + "requires" : { + "Scalar::Util" : "0" + } + } + }, + "release_status" : "stable", + "version" : "0.45" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-Rsync-0.43/META.yml new/File-Rsync-0.45/META.yml --- old/File-Rsync-0.43/META.yml 2009-08-18 18:20:45.000000000 +0200 +++ new/File-Rsync-0.45/META.yml 2014-11-07 15:59:18.000000000 +0100 @@ -1,20 +1,22 @@ ---- #YAML:1.0 -name: File-Rsync -version: 0.43 -abstract: Wrapper module for rsync(1) http://rsync.samba.org/ +--- +abstract: 'Wrapper module for rsync(1) http://rsync.samba.org/' author: - - Lee Eakin <lea...@dfw.nostrum.com> -license: unknown -distribution_type: module + - 'Lee Eakin <lea...@dfw.nostrum.com>' +build_requires: + ExtUtils::MakeMaker: '0' configure_requires: - ExtUtils::MakeMaker: 0 -requires: - Scalar::Util: 0 -no_index: - directory: - - t - - inc -generated_by: ExtUtils::MakeMaker version 6.48 + ExtUtils::MakeMaker: '0' +dynamic_config: 1 +generated_by: 'ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.142690' +license: unknown meta-spec: - url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: '1.4' +name: File-Rsync +no_index: + directory: + - t + - inc +requires: + Scalar::Util: '0' +version: '0.45' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-Rsync-0.43/Makefile.PL new/File-Rsync-0.45/Makefile.PL --- old/File-Rsync-0.43/Makefile.PL 2008-12-17 23:43:43.000000000 +0100 +++ new/File-Rsync-0.45/Makefile.PL 2014-11-06 16:52:17.000000000 +0100 @@ -17,10 +17,7 @@ AUTHOR => $AUTHOR, ABSTRACT => $ABSTRACT, PREREQ_PM => { 'Scalar::Util' => 0 }, - PL_FILES => { 'makepm.PL' => 'config.pm' }, - PM => { 'Rsync.pm' => '$(INST_LIB)/File/Rsync.pm', - 'config.pm' => '$(INST_ARCHLIB)/File/Rsync/Config.pm' }, + PM => { 'Rsync.pm' => '$(INST_LIB)/File/Rsync.pm' }, dist => { COMPRESS => 'gzip', SUFFIX => 'gz' }, - realclean => { FILES => 'config.pm' }, ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-Rsync-0.43/README new/File-Rsync-0.45/README --- old/File-Rsync-0.43/README 2009-08-18 18:17:31.000000000 +0200 +++ new/File-Rsync-0.45/README 2014-11-06 16:48:31.000000000 +0100 @@ -1,18 +1,17 @@ File-Rsync - A wrapper module for rsync(1) http://rsync.samba.org/rsync/ ******************************************************************************* -Copyright (C) 2000-2005 Lee Eakin. All rights reserved. +Copyright (C) 2000-2014 Lee Eakin. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. ******************************************************************************* -Updated to support new options of rsync 2.6.7 +Updated to use $PATH environment variable to find rsync instead of hard-coding in +the module since prompting breaks automatic builds and most modren systems should +have rsync installed by now. It can be overridden using path-to-rsync at run time. -This is a long overdue update that has been sitting in my queue. - -Another update is due as well that would change to orderd args based on -discussions with Gavin Carr. I hope to have it ready soon along with -any new option support since 2.6.7. +Many more long overdue updates, hopefully very soon to come including +one that would change to orderd args based on discussions with Gavin Carr. Although I am the original author and maintainer, many of the bug fixes and improvements have come as either suggestions or patches from the perl @@ -31,7 +30,7 @@ make make test make install - + Once installed you can use 'perldoc File::Rsync' to get the rest of the documentation. Or if you'd prefer to examine the docs before installation try 'perldoc -F Rsync.pm'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-Rsync-0.43/Rsync.pm new/File-Rsync-0.45/Rsync.pm --- old/File-Rsync-0.43/Rsync.pm 2009-08-18 18:00:31.000000000 +0200 +++ new/File-Rsync-0.45/Rsync.pm 2014-11-07 15:45:24.000000000 +0100 @@ -19,13 +19,12 @@ use IO::Select; use POSIX ":sys_wait_h"; use Carp 'carp'; -use File::Rsync::Config; use Scalar::Util qw(blessed); use strict; use vars qw($VERSION); -$VERSION = '0.43'; +$VERSION = '0.45'; =head1 NAME @@ -71,11 +70,11 @@ Options may be passed in the form of a hash and are the same as the long options in I<rsync(1)> with the leading double-dash removed. An additional option of B<path-to-rsync> also exists which can be used to override the -hardcoded path to the rsync binary that is defined when the module is -installed, and B<debug> which causes the module methods to print some -debugging information to STDERR. There are also 2 options to wrap the -source and/or destination paths in double-quotes. They are B<quote-src> -and B<quote-dst>, and may be useful in protecting the paths from shell +using PATH environemt variable to find the rsync command binary, and +B<debug> which causes the module methods to print some debugging +information to STDERR. There are also 2 options to wrap the source and/or +destination paths in double-quotes. They are B<quote-src> and +B<quote-dst>, and may be useful in protecting the paths from shell expansion (particularly useful for paths containing spaces). The B<outfun> and B<errfun> options take a function reference. The function is called once for each line of output from the I<rsync> program with the @@ -128,7 +127,7 @@ B<itemize-changes>, B<list-only>, B<omit-dir-times>, B<remove-sent-files>, B<max-size>, and B<protocol>. -Version 0.38 of this module also adds support for the B<acls> option that +Version 0.38 of this module also added support for the B<acls> option that is not part of I<rsync(1)> unless the patch has been applied, but people do use it. It also includes a new B<literal> option that takes an array reference similar to B<include>, B<exclude>, and B<filter>. Any arguments in the array @@ -149,8 +148,8 @@ # seed the options hash, booleans, scalars, excludes, source, dest, data, # status, stderr/stdout storage for last exec my $self = { - # the full path name to the rsync binary - 'path-to-rsync' => $RsyncConfig{rsync_path}, + # the path name to the rsync binary (default is to use $PATH) + 'path-to-rsync' => 'rsync', # these are the boolean flags to rsync, all default off, including them # in the args list turns them on 'flag' => {qw( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-Rsync-0.43/config.in new/File-Rsync-0.45/config.in --- old/File-Rsync-0.43/config.in 2008-12-17 23:43:43.000000000 +0100 +++ new/File-Rsync-0.45/config.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -# -*- perl -*- -# vim:ft=perl foldlevel=1 -package File::Rsync::Config; - -require Exporter; -use vars qw(@ISA @EXPORT %RsyncConfig); -use strict; - -@EXPORT=qw(%RsyncConfig); -@ISA=qw(Exporter); - -%RsyncConfig=( - rsync_path => '/usr/local/bin/rsync', -); -1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-Rsync-0.43/makepm.PL new/File-Rsync-0.45/makepm.PL --- old/File-Rsync-0.43/makepm.PL 2008-12-17 23:43:43.000000000 +0100 +++ new/File-Rsync-0.45/makepm.PL 1970-01-01 01:00:00.000000000 +0100 @@ -1,37 +0,0 @@ -# makepm.PL -- Builds Rsync.pm from Rsync.in. -*- perl -*- -sub find_rsync { - my @dirs = map { s/^$/./; $_ } split (':', $ENV{PATH}); - push (@dirs, qw(/usr/local/bin /usr/bin /opt/bin)); - for my $dir (@dirs) { - next unless -d $dir; - next unless -x "$dir/rsync"; - return "$dir/rsync"; - } -} -$|=1; -$RSYNC=&find_rsync; -print <<'EOT'; - -File::Rsync needs to know the path to the rsync binary. This path is encoded -in the installed module as the default path to rsync (it can be overridden -at runtime). Please enter the full path to the rsync program or just hit -Enter if the guess is correct. (If you always want the module to depend on -the $PATH environment variable at runtime, just set the path to 'rsync' -(this is not recommended)). - -EOT -$RSYNC||='/usr/local/bin/rsync'; -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"; -while (<IN>) { - if (/^(\s*rsync_path\s*=>)/) { print OUT "$1 '$RSYNC',\n" } - else { print OUT } -} -close IN; -close OUT; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-Rsync-0.43/test.pl new/File-Rsync-0.45/test.pl --- old/File-Rsync-0.43/test.pl 2009-08-18 17:26:32.000000000 +0200 +++ new/File-Rsync-0.45/test.pl 2014-11-07 15:58:00.000000000 +0100 @@ -11,10 +11,10 @@ warn "\nNOTE: expect 'badoption' message for test 7\n\n"; print "ok 1\n"; -unless (-x $File::Rsync::RsyncConfig{rsync_path}) { +unless (whence('rsync')) { $fail++; print "not ok 2\n"; - warn "configured path to rsync binary ($File::Rsync::RsyncConfig{rsync_path}) does not exist or is not executable\n"; + warn "rsync binary not found in PATH ($ENV{PATH})\n"; exit 1; } print "ok 2\n"; @@ -93,3 +93,9 @@ system qw(rm -rf destdir); exit 1 if $fail; + +sub whence { + my $cmd = shift; + -x "$_/$cmd" && return "$_/$cmd" for (split /:/, $ENV{PATH}); + return; +} ++++++ cpanspec.yml ++++++ --- description_paragraphs: 1 #no_testing: broken upstream #sources: # - source1 # - source2 #patches: # foo.patch: -p1 # bar.patch: preamble: |- BuildRequires: rsync Requires: rsync #post_prep: |- # hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s, *,,g'` # sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL #post_install: |- # sed on %{name}.files #license: SUSE-NonFree #skip_noarch: 1 #custom_build: - #./Build build flags=%{?_smp_mflags} --myflag #ignore_requires: Bizarre::Module
