psabata pushed to perl-String-Diff (f23). "0.07 bump (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Sep 24 15:24:28 UTC 2015
From 8ea731e160919f8e4bcd24f61ab0091cf1bbadd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0abata?= <contyk at redhat.com>
Date: Thu, 24 Sep 2015 17:22:03 +0200
Subject: 0.07 bump
- Modernize the spec file
- Package the license text
- Add a weak dependency on Algorithm::Diff::XS
diff --git a/.gitignore b/.gitignore
index c31604b..9cf0c6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
String-Diff-0.04.tar.gz
/String-Diff-0.05.tar.gz
/String-Diff-0.06.tar.gz
+/String-Diff-0.07.tar.gz
diff --git a/String-Diff-0.07-podspell.patch b/String-Diff-0.07-podspell.patch
new file mode 100644
index 0000000..adcc21e
--- /dev/null
+++ b/String-Diff-0.07-podspell.patch
@@ -0,0 +1,25 @@
+From adba39e0ac004fbe5b599717d752407d43a3344d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20=C5=A0abata?= <contyk at redhat.com>
+Date: Thu, 24 Sep 2015 17:02:44 +0200
+Subject: [PATCH] Fix the failing POD test
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Šabata <contyk at redhat.com>
+---
+ xt/97_podspell.t | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/xt/97_podspell.t b/xt/97_podspell.t
+index 9b7d101..f52c358 100644
+--- a/xt/97_podspell.t
++++ b/xt/97_podspell.t
+@@ -11,3 +11,4 @@ searchable
+ HTML
+ linebreak
+ diff
++shibuya
+--
+2.4.3
+
diff --git a/perl-String-Diff.spec b/perl-String-Diff.spec
index 9541abf..b31968b 100644
--- a/perl-String-Diff.spec
+++ b/perl-String-Diff.spec
@@ -1,25 +1,43 @@
Name: perl-String-Diff
-Version: 0.06
-Release: 8%{?dist}
+Version: 0.07
+Release: 1%{?dist}
Summary: Simple diff to String
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/String-Diff/
Source0: http://www.cpan.org/authors/id/Y/YA/YAPPO/String-Diff-%{version}.tar.gz
+# ghpr#3
+Patch0: String-Diff-0.07-podspell.patch
BuildArch: noarch
+# Build
+BuildRequires: make
+BuildRequires: perl
BuildRequires: perl(inc::Module::Install)
-BuildRequires: perl(Module::Install::TestBase)
-# Run-time
+BuildRequires: perl(Module::Install::GithubMeta)
+BuildRequires: perl(Module::Install::ReadmeFromPod)
+BuildRequires: perl(Module::Install::ReadmeMarkdownFromPod)
+BuildRequires: perl(Module::Install::Repository)
+BuildRequires: perl(YAML)
+# Runtime
BuildRequires: perl(Algorithm::Diff)
+# Preferred but currently unavailable:
+# BuildRequires: perl(Algorithm::Diff::XS)
BuildRequires: perl(base)
BuildRequires: perl(Exporter)
-# Tests
+BuildRequires: perl(strict)
+BuildRequires: perl(warnings)
+# Tests only
BuildRequires: perl(Test::Base)
BuildRequires: perl(Test::More)
-BuildRequires: perl(YAML)
-# required, but not automatically detected
+BuildRequires: perl(utf8)
+# Optional tests only
+BuildRequires: perl(Test::Perl::Critic)
+BuildRequires: perl(Test::Pod) >= 1.00
+BuildRequires: perl(Test::Spelling)
+Requires: perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version))
Requires: perl(Algorithm::Diff)
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# The XS variant is preferred by default, with PP as a fallback:
+Recommends: perl(Algorithm::Diff::XS)
%description
String::Diff is the difference of a consecutive string is made. after
@@ -27,27 +45,32 @@ general diff is done, the difference in the line is searchable.
%prep
%setup -q -n String-Diff-%{version}
+%patch0 -p1
%build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
make %{?_smp_mflags}
%install
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
+make pure_install DESTDIR=%{buildroot}
+%{_fixperms} %{buildroot}/*
%check
make test
%files
+%license LICENSE
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*
%changelog
+* Thu Sep 24 2015 Petr Šabata <contyk at redhat.com> - 0.07-1
+- 0.07 bump
+- Modernize the spec file
+- Package the license text
+- Add a weak dependency on Algorithm::Diff::XS
+
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.06-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
diff --git a/rt76371.patch b/rt76371.patch
deleted file mode 100644
index 1a5ad58..0000000
--- a/rt76371.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -up String-Diff-0.05/t/05_diff_regexp-pp.t.orig String-Diff-0.05/t/05_diff_regexp-pp.t
---- String-Diff-0.05/t/05_diff_regexp-pp.t.orig 2012-06-22 00:39:48.000000000 -0600
-+++ String-Diff-0.05/t/05_diff_regexp-pp.t 2012-06-23 09:04:42.000000000 -0600
-@@ -45,10 +45,10 @@ new: Boofy
-
- ===
- --- data1
--(?:あ|いつもい)る(?:晴れた日に散歩をすると|人がいないので)、そ(?:こに|れ)は
-+(?:あ|いつもい)る(?:晴れた日に散歩をすると|人がいないので)そ(?:こに|れ)は
- --- data2
--old: ある晴れた日に散歩をすると、そこには
--new: いつもいる人がいないので、それは
-+old: ある晴れた日に散歩をするとそこには
-+new: いつもいる人がいないのでそれは
-
- ===
- --- data1
-diff -up String-Diff-0.05/t/05_diff_regexp.t.orig String-Diff-0.05/t/05_diff_regexp.t
---- String-Diff-0.05/t/05_diff_regexp.t.orig 2012-06-22 00:39:48.000000000 -0600
-+++ String-Diff-0.05/t/05_diff_regexp.t 2012-06-23 09:12:24.000000000 -0600
-@@ -44,10 +44,10 @@ new: Boofy
-
- ===
- --- data1
--(?:あ|いつもい)る(?:晴れた日に散歩をすると|人がいないので)、そ(?:こに|れ)は
-+(?:あ|いつもい)る(?:晴れた日に散歩をすると|人がいないので)そ(?:こに|れ)は
- --- data2
--old: ある晴れた日に散歩をすると、そこには
--new: いつもいる人がいないので、それは
-+old: ある晴れた日に散歩をするとそこには
-+new: いつもいる人がいないのでそれは
-
- ===
- --- data1
diff --git a/sources b/sources
index 6962f90..6a2b3be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-be19b772f0ad33ea80cf731c01e8b509 String-Diff-0.06.tar.gz
+b6e73aa4d54a27041297687c409ccc16 String-Diff-0.07.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/perl-String-Diff.git/commit/?h=f23&id=8ea731e160919f8e4bcd24f61ab0091cf1bbadd1
More information about the perl-devel
mailing list