From 71020a190ecd758fc8ad5aa1b9fc823d6341e272 Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emman...@seyman.fr>
Date: Sun, 9 Oct 2016 13:04:12 +0200
Subject: Update to 2.05

---
 .gitignore                                         |  1 +
 ...mFu-2.01-Execute-tests-recusively-under-t.patch | 29 ----------------------
 HTML-FormFu-2.03-mxcheck-disable.patch             |  6 ++---
 perl-HTML-FormFu.spec                              | 25 ++++++-------------
 sources                                            |  2 +-
 5 files changed, 13 insertions(+), 50 deletions(-)
 delete mode 100644 HTML-FormFu-2.01-Execute-tests-recusively-under-t.patch

diff --git a/.gitignore b/.gitignore
index 0462ae4..90e459a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ HTML-FormFu-0.07002.tar.gz
 /HTML-FormFu-1.00.tar.gz
 /HTML-FormFu-2.01.tar.gz
 /HTML-FormFu-2.03.tar.gz
+/HTML-FormFu-2.05.tar.gz
diff --git a/HTML-FormFu-2.01-Execute-tests-recusively-under-t.patch 
b/HTML-FormFu-2.01-Execute-tests-recusively-under-t.patch
deleted file mode 100644
index fe44797..0000000
--- a/HTML-FormFu-2.01-Execute-tests-recusively-under-t.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d3b536b7a55453ce4a00c407f7af7cf8af159cbc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
-Date: Fri, 2 Oct 2015 12:39:37 +0200
-Subject: [PATCH] Execute tests recusively under t
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Required to run tests moved from t-aggregate to t.
-
-bug #1231204
-
-Signed-off-by: Petr Písař <ppi...@redhat.com>
----
- Makefile.PL | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff -up ./Makefile.PL.orig ./Makefile.PL
---- ./Makefile.PL.orig 2016-06-29 10:57:56.939672196 +0200
-+++ ./Makefile.PL      2016-06-29 10:58:27.060493221 +0200
-@@ -81,7 +81,7 @@ my %WriteMakefileArgs = (
-   },
-   "VERSION" => "2.03",
-   "test" => {
--    "TESTS" => "t/*.t"
-+    "RECURSIVE_TEST_FILES" => 1
-   }
- );
- 
diff --git a/HTML-FormFu-2.03-mxcheck-disable.patch 
b/HTML-FormFu-2.03-mxcheck-disable.patch
index 14726ab..0a8ef30 100644
--- a/HTML-FormFu-2.03-mxcheck-disable.patch
+++ b/HTML-FormFu-2.03-mxcheck-disable.patch
@@ -1,6 +1,6 @@
-diff -up HTML-FormFu-2.03/t-aggregate/constraints/email.t.orig 
HTML-FormFu-2.03/t-aggregate/constraints/email.t
---- HTML-FormFu-2.03/t-aggregate/constraints/email.t.orig      2016-07-03 
13:09:32.534232865 +0200
-+++ HTML-FormFu-2.03/t-aggregate/constraints/email.t   2016-07-03 
13:10:26.916909904 +0200
+diff -up HTML-FormFu-2.05/t/constraints/email.t.orig 
HTML-FormFu-2.05/t/constraints/email.t
+--- HTML-FormFu-2.05/t/constraints/email.t.orig        2016-07-03 
13:09:32.534232865 +0200
++++ HTML-FormFu-2.05/t/constraints/email.t     2016-07-03 13:10:26.916909904 
+0200
 @@ -1,7 +1,7 @@
  use strict;
  use warnings;
diff --git a/perl-HTML-FormFu.spec b/perl-HTML-FormFu.spec
index a5c5611..31deaa4 100644
--- a/perl-HTML-FormFu.spec
+++ b/perl-HTML-FormFu.spec
@@ -1,14 +1,11 @@
 Name:           perl-HTML-FormFu
-Version:        2.03
+Version:        2.05
 Release:        1%{?dist}
 Summary:        HTML Form Creation, Rendering and Validation Framework
 License:        GPL+ or Artistic
-Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/HTML-FormFu/
-Source0:        
http://search.cpan.org/CPAN/authors/id/C/CF/CFRANKS/HTML-FormFu-%{version}.tar.gz
-# Do not use Test::Aggregate::Nested for running tests, bug #1231204
-Patch0:         HTML-FormFu-2.01-Execute-tests-recusively-under-t.patch
-Patch1:         HTML-FormFu-2.03-mxcheck-disable.patch
+Source0:        
http://search.cpan.org/CPAN/authors/id/N/NI/NIGELM/HTML-FormFu-%{version}.tar.gz
+Patch0:         HTML-FormFu-2.03-mxcheck-disable.patch
 BuildArch:      noarch
 BuildRequires:  coreutils
 BuildRequires:  findutils
@@ -59,12 +56,12 @@ BuildRequires:  perl(Number::Format)
 BuildRequires:  perl(Path::Class::File)
 BuildRequires:  perl(POSIX)
 BuildRequires:  perl(Readonly)
+BuildRequires:  perl(Regexp::Assemble)
 BuildRequires:  perl(Regexp::Common)
 BuildRequires:  perl(Scalar::Util)
 BuildRequires:  perl(Storable)
 BuildRequires:  perl(Task::Weaken)
 BuildRequires:  perl(Template)
-# Test::Aggregate::Nested disabled
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(Test::Memory::Cycle)
 BuildRequires:  perl(Test::More) >= 0.92
@@ -100,20 +97,10 @@ anything else you might want to do (as long as it involves 
forms).
 %prep
 %setup -q -n HTML-FormFu-%{version}
 %patch0 -p1
-%patch1 -p1
 
 find examples -type f | xargs chmod 644
 find examples -type f | xargs sed -i -e 's/\r//'
 
-# Do not use Test::Aggregate::Nested for running tests, bug #1231204
-rm t/aggregate.t
-sed -i -e '/^t\/aggregate\.t/d' MANIFEST
-mv t-aggregate/* t
-find t -type f -exec sed -i -e 's|\<t-aggregate\>|t|' {} +
-sed -i -e 's|^t-aggregate/|t/|' MANIFEST
-sed -i -e 's|^\^t-aggregate\\/|^t\\/|' MANIFEST.SKIP
-
-
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
 make %{?_smp_mflags}
@@ -135,6 +122,10 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Sun Oct 09 2016 Emmanuel Seyman <emman...@seyman.fr> - 2.05-1
+- Update to 2.05
+- Remove hacks and patchs related to Test::Aggregate (no longer used)
+
 * Wed Jun 29 2016 Emmanuel Seyman <emman...@seyman.fr> - 2.03-1
 - Update to 2.03
 - Remove tests that do mxchecks (koji doesn't allow network access)
diff --git a/sources b/sources
index 8fbf27a..6959bdb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-43fe92f27ab11e7687382c936e9d0e7e  HTML-FormFu-2.03.tar.gz
+71322ae1946a20944a6d31adfecad545  HTML-FormFu-2.05.tar.gz
-- 
cgit v0.12


        
http://pkgs.fedoraproject.org/cgit/perl-HTML-FormFu.git/commit/?h=master&id=71020a190ecd758fc8ad5aa1b9fc823d6341e272
_______________________________________________
perl-devel mailing list -- perl-devel@lists.fedoraproject.org
To unsubscribe send an email to perl-devel-le...@lists.fedoraproject.org

Reply via email to