Hello community,
here is the log from the commit of package perl-Algorithm-Diff for
openSUSE:Factory checked in at 2015-04-16 14:12:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Algorithm-Diff (Old)
and /work/SRC/openSUSE:Factory/.perl-Algorithm-Diff.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Algorithm-Diff"
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Algorithm-Diff/perl-Algorithm-Diff.changes
2011-11-17 16:03:08.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.perl-Algorithm-Diff.new/perl-Algorithm-Diff.changes
2015-04-16 14:12:53.000000000 +0200
@@ -1,0 +2,17 @@
+Tue Apr 14 10:05:05 UTC 2015 - co...@suse.com
+
+- updated to 1.1903
+ see /usr/share/doc/packages/perl-Algorithm-Diff/Changes
+
+ 1.19_03 2014-11-25
+ - Fix documentation typos (RT 84981)
+ contributed by dsteinbrunner
+ - add -w and -i switches to diffnew.pl (RT 69945)
+ contributed by Brian.Eschner
+ - Remove Algorithm::DiffOld from the index
+ The module is still distributed with Algorithm::Diff, but is not indexed on
+ CPAN because this is an ***UNAUTHORIZED*** release of Algorithm::DiffOld.
+
+- droped requirement to patch - it clearly doesn't use patch at all
+
+-------------------------------------------------------------------
Old:
----
Algorithm-Diff-1.1902.tar.gz
New:
----
Algorithm-Diff-1.1903.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Algorithm-Diff.spec ++++++
--- /var/tmp/diff_new_pack.gs8iDT/_old 2015-04-16 14:12:53.000000000 +0200
+++ /var/tmp/diff_new_pack.gs8iDT/_new 2015-04-16 14:12:53.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package perl-Algorithm-Diff
#
-# 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
@@ -16,24 +16,19 @@
#
-
Name: perl-Algorithm-Diff
-Version: 1.1902
-Release: 1
-License: GPL-1.0+ or Artistic-1.0
+Version: 1.1903
+Release: 0
%define cpan_name Algorithm-Diff
Summary: Compute `intelligent' differences between two files / lists
-Url: http://search.cpan.org/dist/Algorithm-Diff/
+License: GPL-1.0+ or Artistic-1.0
Group: Development/Libraries/Perl
+Url: http://search.cpan.org/dist/Algorithm-Diff/
Source:
http://www.cpan.org/authors/id/T/TY/TYEMQ/%{cpan_name}-%{version}.tar.gz
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
BuildRequires: perl-macros
-#MANUAL BEGIN
-BuildRequires: patch
-Requires: patch
-#MANUAL END
%{perl_requires}
%description
++++++ Algorithm-Diff-1.1902.tar.gz -> Algorithm-Diff-1.1903.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Algorithm-Diff-1.1902/Changes
new/Algorithm-Diff-1.1903/Changes
--- old/Algorithm-Diff-1.1902/Changes 2006-07-31 07:56:48.000000000 +0200
+++ new/Algorithm-Diff-1.1903/Changes 2014-11-26 06:38:10.000000000 +0100
@@ -1,5 +1,14 @@
Revision history for Perl module Algorithm::Diff.
+1.19_03 2014-11-25
+- Fix documentation typos (RT 84981)
+ contributed by dsteinbrunner
+- add -w and -i switches to diffnew.pl (RT 69945)
+ contributed by Brian.Eschner
+- Remove Algorithm::DiffOld from the index
+ The module is still distributed with Algorithm::Diff, but is not indexed on
+ CPAN because this is an ***UNAUTHORIZED*** release of Algorithm::DiffOld.
+
1.19_02 2006-07-31
- Fix typo in @EXPORT_OK (s/LCDidx/LCSidx/) (RT 8576)
- Use 'printf' in example code, not 'sprintf' nor 'sprint' (RT 16067)
@@ -32,7 +41,7 @@
- Changed version label string.
- Put MJD's PPT diff version into this distribution as diffnew.pl
-1.04 Added documentation.
+1.04 Added documentation.
1.03 Working version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Algorithm-Diff-1.1902/MANIFEST
new/Algorithm-Diff-1.1903/MANIFEST
--- old/Algorithm-Diff-1.1902/MANIFEST 2004-09-23 16:19:44.000000000 +0200
+++ new/Algorithm-Diff-1.1903/MANIFEST 2014-11-26 06:43:01.000000000 +0100
@@ -11,3 +11,4 @@
diffnew.pl Full-featured Unix diff utility written in Perl
htmldiff.pl Sample using traverse_sequences
META.yml Module meta-data (added by MakeMaker)
+META.json Module JSON meta-data (added by
MakeMaker)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Algorithm-Diff-1.1902/META.json
new/Algorithm-Diff-1.1903/META.json
--- old/Algorithm-Diff-1.1902/META.json 1970-01-01 01:00:00.000000000 +0100
+++ new/Algorithm-Diff-1.1903/META.json 2014-11-26 06:43:01.000000000 +0100
@@ -0,0 +1,39 @@
+{
+ "abstract" : "unknown",
+ "author" : [
+ "unknown"
+ ],
+ "dynamic_config" : 1,
+ "generated_by" : "ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter
version 2.141170",
+ "license" : [
+ "unknown"
+ ],
+ "meta-spec" : {
+ "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec";,
+ "version" : "2"
+ },
+ "name" : "Algorithm-Diff",
+ "no_index" : {
+ "directory" : [
+ "t",
+ "inc"
+ ]
+ },
+ "prereqs" : {
+ "build" : {
+ "requires" : {
+ "ExtUtils::MakeMaker" : "0"
+ }
+ },
+ "configure" : {
+ "requires" : {
+ "ExtUtils::MakeMaker" : "0"
+ }
+ },
+ "runtime" : {
+ "requires" : {}
+ }
+ },
+ "release_status" : "stable",
+ "version" : "1.1903"
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Algorithm-Diff-1.1902/META.yml
new/Algorithm-Diff-1.1903/META.yml
--- old/Algorithm-Diff-1.1902/META.yml 2006-07-31 07:57:28.000000000 +0200
+++ new/Algorithm-Diff-1.1903/META.yml 2014-11-26 06:43:01.000000000 +0100
@@ -1,10 +1,21 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
-name: Algorithm-Diff
-version: 1.1902
-version_from: lib/Algorithm/Diff.pm
-installdirs: site
-requires:
-
-distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.17
+---
+abstract: unknown
+author:
+ - unknown
+build_requires:
+ ExtUtils::MakeMaker: '0'
+configure_requires:
+ ExtUtils::MakeMaker: '0'
+dynamic_config: 1
+generated_by: 'ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version
2.141170'
+license: unknown
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: '1.4'
+name: Algorithm-Diff
+no_index:
+ directory:
+ - t
+ - inc
+requires: {}
+version: '1.1903'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Algorithm-Diff-1.1902/cdiff.pl
new/Algorithm-Diff-1.1903/cdiff.pl
--- old/Algorithm-Diff-1.1902/cdiff.pl 2004-09-23 16:19:44.000000000 +0200
+++ new/Algorithm-Diff-1.1903/cdiff.pl 2014-11-26 06:35:09.000000000 +0100
@@ -135,7 +135,7 @@
# Save the start & beginning of each array. If the array doesn't exist
# though (e.g., we're only adding items in this block), then figure
# out the line number based on the line number of the other file and
- # the current difference in file lenghts
+ # the current difference in file lengths
my @remove_array = $block->remove;
my @insert_array = $block->insert;
my ($a1, $a2, $b1, $b2, $start1, $start2, $end1, $end2);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Algorithm-Diff-1.1902/diffnew.pl
new/Algorithm-Diff-1.1903/diffnew.pl
--- old/Algorithm-Diff-1.1902/diffnew.pl 2004-09-23 16:19:36.000000000
+0200
+++ new/Algorithm-Diff-1.1903/diffnew.pl 2014-11-26 06:35:09.000000000
+0100
@@ -32,7 +32,7 @@
########################
my $usage = << "ENDUSAGE";
-Usage: $0 [{-c | -C lines -e | -f | -u | -U lines}] oldfile newfile
+Usage: $0 [{-c | -C lines -e | -f | -u | -U lines |-q | -i | -w}] oldfile
newfile
-c do a context diff with 3 lines of context
-C do a context diff with 'lines' lines of context (implies -c)
-e create a script for the ed editor to change oldfile to newfile
@@ -40,13 +40,16 @@
-u do a unified diff with 3 lines of context
-U do a unified diff with 'lines' lines of context (implies -u)
-q report only whether or not the files differ
+ -i ignore differences in Upper/lower-case
+ -w ignore differences in white-space (space and TAB characters)
By default it will do an "old-style" diff, with output like UNIX diff
ENDUSAGE
my $Context_Lines = 0; # lines of context to print. 0 for old-style diff
my $Diff_Type = "OLD"; # by default, do standard UNIX diff
-my ($opt_c, $opt_u, $opt_e, $opt_f, $opt_q);
+my ($opt_c, $opt_u, $opt_e, $opt_f, $opt_q, $opt_i, $opt_w);
+my $compareRoutineRef = undef;
while ($ARGV[0] =~ /^-/) {
my $opt = shift;
last if $opt eq '--';
@@ -77,6 +80,12 @@
$opt_q = 1;
$opt_e = 1;
$Diff_Type = "ED";
+ } elsif ($opt =~ /^-i$/) {
+ $opt_i = 1;
+ $compareRoutineRef = \&compareRoutine;
+ } elsif ($opt =~ /^-w$/) {
+ $opt_w = 1;
+ $compareRoutineRef = \&compareRoutine;
} else {
$opt =~ s/^-//;
bag("Illegal option -- $opt");
@@ -112,7 +121,7 @@
close F2;
# diff yields lots of pieces, each of which is basically a Block object
-my $diffs = diff(\@f1, \@f2);
+my $diffs = diff(\@f1, \@f2, $compareRoutineRef);
exit 0 unless @$diffs;
if ($opt_q and @$diffs) {
@@ -162,6 +171,13 @@
exit 2;
}
+sub compareRoutine {
+ my $line = shift;
+ $line =~ s/[ \t\r\n]+//g if ($opt_w);
+ $line = uc( $line ) if ($opt_i);
+ return $line;
+}
+
########
# Package Hunk. A Hunk is a group of Blocks which overlap because of the
# context surrounding each block. (So if we're not using context, every
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Algorithm-Diff-1.1902/lib/Algorithm/Diff.pm
new/Algorithm-Diff-1.1903/lib/Algorithm/Diff.pm
--- old/Algorithm-Diff-1.1902/lib/Algorithm/Diff.pm 2006-07-31
07:55:36.000000000 +0200
+++ new/Algorithm-Diff-1.1903/lib/Algorithm/Diff.pm 2014-11-26
06:41:53.000000000 +0100
@@ -5,7 +5,7 @@
use integer; # see below in _replaceNextLargerWith() for mod to make
# if you don't use this
use vars qw( $VERSION @EXPORT_OK );
-$VERSION = 1.19_02;
+$VERSION = 1.19_03;
# ^ ^^ ^^-- Incremented at will
# | \+----- Incremented for non-trivial changes to features
# \-------- Incremented for fundamental changes
@@ -885,7 +885,7 @@
and you want to find the longest sequence of items that is present in
both original sequences in the same order. That is, you want to find
a new sequence I<S> which can be obtained from the first sequence by
-deleting some items, and from the secend sequence by deleting other
+deleting some items, and from the second sequence by deleting other
items. You also want I<S> to be as long as possible. In this case I<S>
is
@@ -1057,7 +1057,7 @@
$copy = $diff->Copy( $newPos, $newBase );
-C<Copy> returns a copy of the object. The copy and the orignal object
+C<Copy> returns a copy of the object. The copy and the original object
share most of their data, so making copies takes very little memory.
The copy maintains its own position (separate from the original), which
is the main purpose of copies. It also maintains its own base.
@@ -1129,7 +1129,7 @@
C<Same> returns a true value iff the current hunk contains items that
are the same in both sequences. It actually returns the list of items
-if they are the same or an emty list if they aren't. In a scalar
+if they are the same or an empty list if they aren't. In a scalar
context, it returns the size of the list.
=item C<Items>
@@ -1141,9 +1141,9 @@
are part of the current hunk.
If the current hunk contains only insertions, then
-C<< $diff->Items(1) >> will return an empty list (0 in a scalar conext).
+C<< $diff->Items(1) >> will return an empty list (0 in a scalar context).
If the current hunk contains only deletions, then C<< $diff->Items(2) >>
-will return an empty list (0 in a scalar conext).
+will return an empty list (0 in a scalar context).
If the hunk contains replacements, then both C<< $diff->Items(1) >> and
C<< $diff->Items(2) >> will return different, non-empty lists.
@@ -1483,7 +1483,7 @@
Initially, the arrows point to the first elements of the respective
sequences. C<traverse_sequences> will advance the arrows through the
sequences one element at a time, calling an appropriate user-specified
-callback function before each advance. It willadvance the arrows in
+callback function before each advance. It will advance the arrows in
such a way that if there are equal elements C<$A[$i]> and C<$B[$j]>
which are equal and which are part of the LCS, there will be some moment
during the execution of C<traverse_sequences> when arrow A is pointing
@@ -1559,7 +1559,7 @@
computed LCS. Instead of sticking to one side and showing element changes
as insertions and deletions only, it will jump back and forth between
the two sequences and report I<changes> occurring as deletions on one
-side followed immediatly by an insertion on the other side.
+side followed immediately by an insertion on the other side.
In addition to the C<DISCARD_A>, C<DISCARD_B>, and C<MATCH> callbacks
supported by C<traverse_sequences>, C<traverse_balanced> supports
@@ -1580,7 +1580,7 @@
with different order of events.
C<traverse_balanced> might be a bit slower than C<traverse_sequences>,
-noticable only while processing huge amounts of data.
+noticeable only while processing huge amounts of data.
The C<sdiff> function of this module
is implemented as call to C<traverse_balanced>.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Algorithm-Diff-1.1902/lib/Algorithm/DiffOld.pm
new/Algorithm-Diff-1.1903/lib/Algorithm/DiffOld.pm
--- old/Algorithm-Diff-1.1902/lib/Algorithm/DiffOld.pm 2006-07-31
07:51:12.000000000 +0200
+++ new/Algorithm-Diff-1.1903/lib/Algorithm/DiffOld.pm 2014-11-26
06:35:09.000000000 +0100
@@ -2,7 +2,8 @@
# like versions <= 0.59 used to.
# $Revision: 1.3 $
-package Algorithm::DiffOld;
+package # don't index
+ Algorithm::DiffOld;
use strict;
use vars qw($VERSION @EXPORT_OK @ISA @EXPORT);
use integer; # see below in _replaceNextLargerWith() for mod to make
@@ -30,7 +31,7 @@
function.
Because each of the lines in one array have to be compared with each
-of the lines in the other array, this does M*N comparisions. This can
+of the lines in the other array, this does M*N comparisons. This can
be very slow. I clocked it at taking 18 times as long as the stock
version of Algorithm::Diff for a 4000-line file. It will get worse
quadratically as array sizes increase.
