[mojomojo] update helper scripts using current catalyst

[Iain Arnell]

commit 086117f3871d41fc9aecbfc5719302167426475e
Author: Iain Arnell <iarnell at gmail.com>
Date:   Wed Aug 31 06:08:00 2011 +0200

    update helper scripts using current catalyst

 mojomojo-paths.patch |   63 --------------------------------------------------
 mojomojo.spec        |   12 ++++++++-
 2 files changed, 11 insertions(+), 64 deletions(-)
---
diff --git a/mojomojo-paths.patch b/mojomojo-paths.patch
index 65e0ed0..da24596 100644
--- a/mojomojo-paths.patch
+++ b/mojomojo-paths.patch
@@ -25,66 +25,3 @@ diff -up MojoMojo-1.00/mojomojo.conf.orig MojoMojo-1.00/mojomojo.conf
  
  <session>
      expires 604800
-diff -up MojoMojo-1.00/script/mojomojo_cgi.pl.orig MojoMojo-1.00/script/mojomojo_cgi.pl
---- MojoMojo-1.00/script/mojomojo_cgi.pl.orig	2010-05-08 19:13:32.000000000 +0200
-+++ MojoMojo-1.00/script/mojomojo_cgi.pl	2010-05-21 06:01:32.000000000 +0200
-@@ -1,6 +1,9 @@
- #!/usr/bin/env perl
- 
--BEGIN { $ENV{CATALYST_ENGINE} ||= 'CGI' }
-+BEGIN { 
-+    $ENV{MOJOMOJO_HOME} ||= '/var/lib/mojomojo';
-+    $ENV{CATALYST_ENGINE} ||= 'CGI';
-+}
- 
- use strict;
- use warnings;
-diff -up MojoMojo-1.00/script/mojomojo_fastcgi.pl.orig MojoMojo-1.00/script/mojomojo_fastcgi.pl
---- MojoMojo-1.00/script/mojomojo_fastcgi.pl.orig	2010-05-08 19:13:32.000000000 +0200
-+++ MojoMojo-1.00/script/mojomojo_fastcgi.pl	2010-05-21 06:01:32.000000000 +0200
-@@ -1,6 +1,9 @@
- #!/usr/bin/env perl
- 
--BEGIN { $ENV{CATALYST_ENGINE} ||= 'FastCGI' }
-+BEGIN { 
-+    $ENV{MOJOMOJO_HOME} ||= '/var/lib/mojomojo';
-+    $ENV{CATALYST_ENGINE} ||= 'FastCGI';
-+}
- 
- use strict;
- use warnings;
-diff -up MojoMojo-1.00/script/mojomojo_server.pl.orig MojoMojo-1.00/script/mojomojo_server.pl
---- MojoMojo-1.00/script/mojomojo_server.pl.orig	2010-05-08 19:13:32.000000000 +0200
-+++ MojoMojo-1.00/script/mojomojo_server.pl	2010-05-21 06:01:32.000000000 +0200
-@@ -1,6 +1,7 @@
- #!/usr/bin/env perl
- 
- BEGIN {
-+    $ENV{MOJOMOJO_HOME} ||= '/var/lib/mojomojo';
-     $ENV{CATALYST_ENGINE} ||= 'HTTP';
-     $ENV{CATALYST_SCRIPT_GEN} = 39;
-     require Catalyst::Engine::HTTP;
-diff -up MojoMojo-1.00/script/mojomojo_spawn_db.pl.orig MojoMojo-1.00/script/mojomojo_spawn_db.pl
---- MojoMojo-1.00/script/mojomojo_spawn_db.pl.orig	2010-05-09 21:16:51.000000000 +0200
-+++ MojoMojo-1.00/script/mojomojo_spawn_db.pl	2010-05-21 06:02:27.000000000 +0200
-@@ -14,7 +14,10 @@ Jonathan Rockway <jrockway at cpan.org>
- 
- =cut
- 
--BEGIN { $ENV{CATALYST_DEBUG} = 0 }
-+BEGIN { 
-+    $ENV{MOJOMOJO_HOME} ||= '/var/lib/mojomojo';
-+    $ENV{CATALYST_DEBUG} = 0;
-+}
- use strict;
- use warnings;
- use FindBin '$Bin';
-@@ -103,7 +106,7 @@ eval {
- };
- if ($@) {
-     die "Your DSN line in mojomojo.conf doesn't look like a valid DSN."
--      . "  Add one, or pass it on the command line.";
-+      . "  Add one, or pass it on the command line. " . $@;
- }
- die "No valid Data Source Name (DSN).\n" if !$dsn;
- $dsn =~ s/__HOME__/$FindBin::Bin\/\.\./g;
diff --git a/mojomojo.spec b/mojomojo.spec
index 8019795..2e71f1d 100644
--- a/mojomojo.spec
+++ b/mojomojo.spec
@@ -1,6 +1,6 @@
 Name:           mojomojo
 Version:        1.04
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Catalyst & DBIx::Class powered Wiki
 License:        GPL+ or Artistic
 Group:          Applications/Internet
@@ -26,6 +26,7 @@ BuildRequires:  perl(Catalyst) >= 5.8000
 BuildRequires:  perl(Catalyst::Action::RenderView) >= 0.07
 BuildRequires:  perl(Catalyst::Authentication::Store::DBIx::Class) >= 0.101
 BuildRequires:  perl(Catalyst::Controller::HTML::FormFu) >= 0.03007
+BuildRequires:  perl(Catalyst::Devel)
 BuildRequires:  perl(Catalyst::Model::DBIC::Schema) >= 0.01
 BuildRequires:  perl(Catalyst::Plugin::Authentication) >= 0.10005
 BuildRequires:  perl(Catalyst::Plugin::Cache) >= 0.08
@@ -203,6 +204,12 @@ page.
 %patch0 -p 1
 %patch2 -p 1
 
+# update the scripts for current catalyst
+rm script/mojomojo_fastcgi_manage.pl
+catalyst.pl -force -scripts .
+# and set MOJOMOJO_HOME
+sed -i '3iBEGIN { $ENV{MOJOMOJO_HOME} ||= "/var/lib/mojomojo"; }' script/*.pl
+
 find root lib -type f | xargs chmod 0644
 
 %build
@@ -270,6 +277,9 @@ CATALYST_CONFIG=t/var/mojomojo.yml make test
 
 
 %changelog
+* Mon Aug 29 2011 Iain Arnell <iarnell at gmail.com> 1.04-4
+- update helper scripts using current catalyst
+
 * Wed Jul 20 2011 Petr Sabata <contyk at redhat.com> - 1.04-3
 - Perl mass rebuild