[perl-Algorithm-Diff] Update to 1.1903

Paul Howarth pghmcfc at fedoraproject.org
Thu Nov 27 12:14:12 UTC 2014


commit af25f4aabb14e0443db63d201f6e2ccc7c63122e
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Nov 27 12:13:12 2014 +0000

    Update to 1.1903
    
    - New upstream release 1.1903
      - Fix documentation typos (CPAN RT#84981)
      - Add -w and -i switches to diffnew.pl (CPAN RT#69945)
      - 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
    - Add patch to generate provide for perl(Algorithm::DiffOld)
    - Drop %defattr, redundant since rpm 4.4
    - General spec tidy-up

 .gitignore                           |    2 +-
 Algorithm-Diff-1.1903-provides.patch |   12 ++++++
 perl-Algorithm-Diff.spec             |   68 +++++++++++++++++++++-------------
 sources                              |    2 +-
 4 files changed, 56 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aa2d248..7578227 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-Algorithm-Diff-1.1902.tar.gz
+/Algorithm-Diff-[0-9.]*.tar.gz
diff --git a/Algorithm-Diff-1.1903-provides.patch b/Algorithm-Diff-1.1903-provides.patch
new file mode 100644
index 0000000..959961e
--- /dev/null
+++ b/Algorithm-Diff-1.1903-provides.patch
@@ -0,0 +1,12 @@
+--- lib/Algorithm/DiffOld.pm
++++ lib/Algorithm/DiffOld.pm
+@@ -2,8 +2,7 @@
+ # like versions <= 0.59 used to.
+ # $Revision: 1.3 $
+ 
+-package # don't index
+-    Algorithm::DiffOld;
++package Algorithm::DiffOld;
+ use strict;
+ use vars qw($VERSION @EXPORT_OK @ISA @EXPORT);
+ use integer;		# see below in _replaceNextLargerWith() for mod to make
diff --git a/perl-Algorithm-Diff.spec b/perl-Algorithm-Diff.spec
index 9152f57..b64a840 100644
--- a/perl-Algorithm-Diff.spec
+++ b/perl-Algorithm-Diff.spec
@@ -1,64 +1,80 @@
 Name:           perl-Algorithm-Diff
-Version:        1.1902
-Release:        21%{?dist}
-Summary:        Algorithm::Diff Perl module
+Version:        1.1903
+Release:        1%{?dist}
+Summary:        Compute `intelligent' differences between two files/lists
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Algorithm-Diff/
 Source0:        http://www.cpan.org/authors/id/T/TY/TYEMQ/Algorithm-Diff-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         Algorithm-Diff-1.1903-provides.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:      noarch
+# Build:
+BuildRequires:  perl
 BuildRequires:  perl(ExtUtils::MakeMaker)
 # Run-time:
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(Exporter)
+BuildRequires:  perl(integer)
+BuildRequires:  perl(strict)
+BuildRequires:  perl(vars)
 # Tests:
 BuildRequires:  perl(Data::Dumper)
 BuildRequires:  perl(lib)
 BuildRequires:  perl(Test)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# Explicit requirements:
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(Carp)
 
 %description
-This is a module for computing the difference between two files, two
-strings, or any other two lists of things.  It uses an intelligent
-algorithm similar to (or identical to) the one used by the Unix "diff"
-program.  It is guaranteed to find the *smallest possible* set of
-differences.
+This is a module for computing the difference between two files, two strings,
+or any other two lists of things. It uses an intelligent algorithm similar to
+(or identical to) the one used by the Unix "diff" program. It is guaranteed to
+find the *smallest possible* set of differences.
 
 %prep
 %setup -q -n Algorithm-Diff-%{version}
-chmod 644 *.pl
+
+# Generate provide for perl(Algorithm::DiffOld)
+%patch0
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
+rm -rf %{buildroot}
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} \;
+%{_fixperms} %{buildroot}
 
-%{_fixperms} $RPM_BUILD_ROOT/*
-
-rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/Algorithm/*.pl
+# Remove example scripts we're shipping as documentation
+rm -f %{buildroot}%{perl_vendorlib}/Algorithm/*.pl
 
 %check
 make test
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
 %doc Changes README *.pl
-%{perl_vendorlib}/*
-%{_mandir}/man3/*
+%{perl_vendorlib}/Algorithm/
+%{_mandir}/man3/Algorithm::Diff.3*
+%{_mandir}/man3/Algorithm::DiffOld.3*
 
 %changelog
+* Thu Nov 27 2014 Paul Howarth <paul at city-fan.org> - 1.1903-1
+- Update to 1.1903
+  - Fix documentation typos (CPAN RT#84981)
+  - Add -w and -i switches to diffnew.pl (CPAN RT#69945)
+  - 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
+- Add patch to generate provide for perl(Algorithm::DiffOld)
+- Drop %%defattr, redundant since rpm 4.4
+- General spec tidy-up
+
 * Wed Aug 27 2014 Jitka Plesnikova <jplesnik at redhat.com> - 1.1902-21
 - Perl 5.20 rebuild
 
@@ -91,7 +107,7 @@ rm -rf $RPM_BUILD_ROOT
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Tue Dec 14 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.1902-11
-- 661697 rebuild for fixing problems with vendorach/lib
+- Rebuild to fix problems with vendorarch/lib (#661697)
 
 * Thu Apr 29 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.1902-10
 - Mass rebuild with perl-5.12.0
diff --git a/sources b/sources
index a1b471a..7ef1381 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ff3e17ae485f8adfb8857b183991fbce  Algorithm-Diff-1.1902.tar.gz
+0e8add21a641b8d66436df0c2024bf3b  Algorithm-Diff-1.1903.tar.gz


More information about the scm-commits mailing list