commit 886cfc6f86ce4549c7c9b1a2967dde5a008c3982
Author: Iain Arnell <iarnell@xxxxxxxxx>
Date: Fri Nov 2 09:03:09 2012 -0600
update to 1.06
.gitignore | 1 +
mojomojo-t-c-email.patch | 43 ++++++++++++++++++++++++++++++++++++++++
mojomojo-t-c-page_delete.patch | 21 +++++++++++++++++++
mojomojo.spec | 18 +++++++++++++---
sources | 2 +-
5 files changed, 80 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9ba11fd..bcd40c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ MojoMojo-1.01.tar.gz
/MojoMojo-1.03.tar.gz
/MojoMojo-1.04.tar.gz
/MojoMojo-1.05.tar.gz
+/MojoMojo-1.06.tar.gz
diff --git a/mojomojo-t-c-email.patch b/mojomojo-t-c-email.patch
new file mode 100644
index 0000000..a4e1339
--- /dev/null
+++ b/mojomojo-t-c-email.patch
@@ -0,0 +1,43 @@
+diff -up MojoMojo-1.06/t/c/email.t.orig MojoMojo-1.06/t/c/email.t
+--- MojoMojo-1.06/t/c/email.t.orig 2012-11-02 07:59:56.000000000 -0600
++++ MojoMojo-1.06/t/c/email.t 2012-11-02 08:00:30.000000000 -0600
+@@ -17,16 +17,16 @@ my $mech = Test::WWW::Mechanize::Catalys
+ my $sender = Email::Sender::Simple->default_transport;
+ # Clear out emails even though there shouldn't be any yet.
+
+-is( scalar( @{$sender->deliveries} ), 0, 'no mails sent yet' );
++is( () = $sender->deliveries, 0, 'no mails sent yet' );
+
+ $mech->get_ok('/.recover_pass');
+ $mech->submit_form_ok( { fields => { recover => 'admin', }, },
+ 'recover submit' );
+
+-is( scalar( @{$sender->deliveries} ), 1, 'new password emailed' );
++is( () = $sender->deliveries, 1, 'new password emailed' );
+
+ # NOTE: The email body content checks are looking for English
+-my ($mail) = $sender->deliveries->[0];
++my ($mail) = ($sender->deliveries)[0];
+ like( $mail->{email}->get_header( 'to' ), qr/^admin/, 'right recipient' );
+ like( $mail->{email}->get_body, qr/new password/i, 'email contains a new password' );
+
+@@ -37,7 +37,7 @@ ok $schema->resultset('Person')->find({l
+
+ # Clear email trap before next test per doc recommendation.
+ $sender->clear_deliveries;
+-is( scalar( @{$sender->deliveries} ), 0, 'email trap reset' );
++is( () = $sender->deliveries, 0, 'email trap reset' );
+
+ $mech->get_ok('/.register');
+
+@@ -70,8 +70,8 @@ $mech->submit_form_ok(
+
+ # NOTE: This test will fail if the user already exists in t/var/mojomojo.db
+ # Run: prove --lib /lib t/01app.t to start with fresh database and then run this test.
+-is( scalar( @{$sender->deliveries} ), 1, 'registerration validation email sent' );
+-($mail) = $sender->deliveries->[0];
++is( () = $sender->deliveries, 1, 'registerration validation email sent' );
++($mail) = ($sender->deliveries)[0];
+ like( $mail->{email}->get_header('to'), qr/^mojam/, 'right recipient' );
+ like( $mail->{email}->get_body, qr/validate your email address/i, 'email contains validate email address' );
+
diff --git a/mojomojo-t-c-page_delete.patch b/mojomojo-t-c-page_delete.patch
new file mode 100644
index 0000000..84ad4f2
--- /dev/null
+++ b/mojomojo-t-c-page_delete.patch
@@ -0,0 +1,21 @@
+diff -up MojoMojo-1.06/t/c/page_delete.t.orig MojoMojo-1.06/t/c/page_delete.t
+--- MojoMojo-1.06/t/c/page_delete.t.orig 2012-11-02 08:37:11.000000000 -0600
++++ MojoMojo-1.06/t/c/page_delete.t 2012-11-02 08:37:51.000000000 -0600
+@@ -18,7 +18,7 @@ BEGIN
+ eval "use WWW::Mechanize::TreeBuilder";
+ plan skip_all => 'need WWW::Mechanize::TreeBuilder' if $@;
+
+- plan tests => 31;
++ plan tests => 32;
+ }
+ use_ok('MojoMojo::Controller::Page');
+
+@@ -106,7 +106,7 @@ ok $mech->click_button(value => 'Yes'),
+
+ #----------------------------------------------------------------------------
+ # Search for deleted page
+-$mech->post( '/.search',
++$mech->post_ok( '/.search',
+ {
+ form_number => 1,
+ fields => { q => $random }
diff --git a/mojomojo.spec b/mojomojo.spec
index 43a0b88..c469e4a 100644
--- a/mojomojo.spec
+++ b/mojomojo.spec
@@ -1,6 +1,6 @@
Name: mojomojo
-Version: 1.05
-Release: 5%{?dist}
+Version: 1.06
+Release: 1%{?dist}
Summary: A Wiki with a tree
License: GPL+ or Artistic
Group: Applications/Internet
@@ -13,6 +13,10 @@ Patch0: formatter-docbook.patch
# adjust paths
Patch2: mojomojo-paths.patch
+# https://github.com/mojomojo/mojomojo/issues/108
+Patch3: mojomojo-t-c-email.patch
+Patch4: mojomojo-t-c-page_delete.patch
+
BuildArch: noarch
# since it comes from CPAN, someone might expect to find
@@ -22,7 +26,7 @@ BuildRequires: perl(Algorithm::Diff) >= 1.19
BuildRequires: perl(Algorithm::Merge)
BuildRequires: perl(Archive::Zip) >= 1.14
BuildRequires: perl(Cache::FastMmap) >= 1.31
-BuildRequires: perl(Catalyst) >= 5.8000
+BuildRequires: perl(Catalyst) >= 5.90015
BuildRequires: perl(Catalyst::Action::RenderView) >= 0.07
BuildRequires: perl(Catalyst::Authentication::Store::DBIx::Class) >= 0.101
BuildRequires: perl(Catalyst::Controller::HTML::FormFu) >= 0.03007
@@ -37,7 +41,7 @@ BuildRequires: perl(Catalyst::Plugin::Session::State::Cookie) >= 0.11
BuildRequires: perl(Catalyst::Plugin::Session::Store::Cache)
BuildRequires: perl(Catalyst::Plugin::Setenv)
BuildRequires: perl(Catalyst::Plugin::Static::Simple) >= 0.07
-BuildRequires: perl(Catalyst::Plugin::SubRequest) >= 0.15
+BuildRequires: perl(Catalyst::Plugin::SubRequest) >= 0.19
BuildRequires: perl(Catalyst::Plugin::Unicode) >= 0.8
BuildRequires: perl(Catalyst::View::Email) >= 0.14
BuildRequires: perl(Catalyst::View::Email::Template)
@@ -205,6 +209,8 @@ wiki page.
%setup -q -n MojoMojo-%{version}
%patch0 -p 1
%patch2 -p 1
+%patch3 -p 1
+%patch4 -p 1
# update the scripts for current catalyst
rm script/mojomojo_fastcgi_manage.pl
@@ -283,6 +289,10 @@ CATALYST_CONFIG=t/var/mojomojo.yml make test
%changelog
+* Fri Nov 02 2012 Iain Arnell <iarnell@xxxxxxxxx> 1.06-1
+- update to latest upstream version
+- patch t/c/email.t and t/c/page_delete.t to work with current versions of dependencies
+
* Wed Oct 31 2012 Iain Arnell <iarnell@xxxxxxxxx> 1.05-5
- update apache configuration for httpd 2.4 (rhbz#871428)
diff --git a/sources b/sources
index 6f0a149..e7c0c10 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f70980e65c7fd3b8ab2bbf40a46a3e4e MojoMojo-1.05.tar.gz
+f89931728a8ece0d82ff1d5f44729116 MojoMojo-1.06.tar.gz
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
