commit 96dc2afb349ec652157c8e7a9824709951950245
Author: Paul Howarth <[email protected]>
Date: Mon Oct 28 14:35:49 2013 +0000
Update to 0.08
- New upstream release 0.08
- Moved repository to GitHub
- Added bug reporting and repository metadata
- Added Text::WordDiff::HTMLTwoLines
- Control and punctuation characters are now treated as standalone chunks
rather than as part of the words that precede them, which makes for much
more intuitive-looking diffs
- Drop %defattr, redundant since rpm 4.4
- Make %files list more explicit
- Don't need to remove empty directories from the buildroot
- Don't use macros for commands
- Specify all dependencies
- Avoid trying to use upstream's private modules in the test suite
.gitignore | 3 +-
Text-WordDiff-0.08-uselib.patch | 11 +++++++
perl-Text-WordDiff.spec | 64 +++++++++++++++++++++++++++++----------
sources | 2 +-
4 files changed, 61 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1e6ac7d..d566881 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-Text-WordDiff-0.04.tar.gz
-/Text-WordDiff-0.05.tar.gz
+/Text-WordDiff-[0-9.]*.tar.gz
diff --git a/Text-WordDiff-0.08-uselib.patch b/Text-WordDiff-0.08-uselib.patch
new file mode 100644
index 0000000..cb2572c
--- /dev/null
+++ b/Text-WordDiff-0.08-uselib.patch
@@ -0,0 +1,11 @@
+--- t/htmltwolines.t
++++ t/htmltwolines.t
+@@ -8,8 +8,6 @@
+ use File::Spec::Functions qw(catfile);
+ use IO::File;
+
+-use lib qw( /Users/gwg/Text-WordDiff-0.05/lib );
+-
+ # BEGIN {
+ use_ok 'Text::WordDiff' or die;
+ use_ok 'Text::WordDiff::HTMLTwoLines' or die;
diff --git a/perl-Text-WordDiff.spec b/perl-Text-WordDiff.spec
index f23d967..ac19d3b 100644
--- a/perl-Text-WordDiff.spec
+++ b/perl-Text-WordDiff.spec
@@ -1,21 +1,36 @@
Name: perl-Text-WordDiff
-Version: 0.05
-Release: 9%{?dist}
+Version: 0.08
+Release: 1%{?dist}
Summary: Track changes between documents
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/Text-WordDiff/
Source0:
http://www.cpan.org/authors/id/D/DW/DWHEELER/Text-WordDiff-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: Text-WordDiff-0.08-uselib.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildArch: noarch
+# Module Build
+BuildRequires: perl(Module::Build)
+# Module Runtime
BuildRequires: perl(Algorithm::Diff) >= 1.19
+BuildRequires: perl(Carp)
+BuildRequires: perl(constant)
BuildRequires: perl(HTML::Entities)
-BuildRequires: perl(Module::Build)
+BuildRequires: perl(IO::File)
+BuildRequires: perl(strict)
+BuildRequires: perl(Term::ANSIColor)
+BuildRequires: perl(vars)
+# Test Suite
+BuildRequires: perl(Encode) >= 1.20
+BuildRequires: perl(File::Spec::Functions)
BuildRequires: perl(Test::More)
-BuildRequires: perl(Test::Pod) >= 1.20
+# Runtime
+Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+BuildRequires: perl(Test::Pod)
Requires: perl(Algorithm::Diff) >= 1.19
-Requires: perl(HTML::Entities)
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo
$version))
+
+# Filter under-specified dependency
+%global __requires_exclude ^perl\\(Algorithm::Diff\\)$
%description
This module is a variation on the lovely Text::Diff module. Rather than
@@ -29,17 +44,17 @@ very nicely.
%prep
%setup -q -n Text-WordDiff-%{version}
+# Don't try to use upstream's personal modules
+%patch0
+
%build
-%{__perl} Build.PL installdirs=vendor
+perl Build.PL installdirs=vendor
./Build
%install
rm -rf $RPM_BUILD_ROOT
-
./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT
%check
./Build test
@@ -48,12 +63,29 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {}
2>/dev/null \;
rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root,-)
-%doc Changes README
-%{perl_vendorlib}/*
-%{_mandir}/man3/*
+%doc Changes README.md
+%{perl_vendorlib}/Text/
+%{_mandir}/man3/Text::WordDiff.3pm*
+%{_mandir}/man3/Text::WordDiff::ANSIColor.3pm*
+%{_mandir}/man3/Text::WordDiff::HTML.3pm*
+%{_mandir}/man3/Text::WordDiff::HTMLTwoLines.3pm*
%changelog
+* Mon Oct 28 2013 Paul Howarth <[email protected]> - 0.08-1
+- Update to 0.08
+ - Moved repository to GitHub
+ - Added bug reporting and repository metadata
+ - Added Text::WordDiff::HTMLTwoLines
+ - Control and punctuation characters are now treated as standalone chunks
+ rather than as part of the words that precede them, which makes for much
+ more intuitive-looking diffs
+- Drop %%defattr, redundant since rpm 4.4
+- Make %%files list more explicit
+- Don't need to remove empty directories from the buildroot
+- Don't use macros for commands
+- Specify all dependencies
+- Avoid trying to use upstream's private modules in the test suite
+
* Sun Aug 04 2013 Fedora Release Engineering <[email protected]>
- 0.05-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 0049624..73f9847 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e0dd883f1b208b02a63f8da1de4a2061 Text-WordDiff-0.05.tar.gz
+124a9b14a7a0471b99e67c35d1c167be Text-WordDiff-0.08.tar.gz
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
[email protected]
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
