[Rt-commit] [rtir] 01/03: Move the RT requirements around

[Kevin Falcone]

This is an automated email from the git hooks/post-receive script.

falcone pushed a commit to branch master
in repository rtir.

commit b23fcb4f6a385ef8b1dfeeb290c4d95002e6b577
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Tue Mar 25 17:19:16 2014 -0400

    Move the RT requirements around
    
    This boxes master in between 4.2.3 and 4.4.0 (future proofing).
    Also does a quick nudge on README and UPGRADING which have version
    numbers.
---
 Makefile.PL               |  4 ++--
 README                    |  4 ++--
 docs/UPGRADING            |  4 ++--
 inc/Module/Install/RTx.pm | 10 ++++++----
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Makefile.PL b/Makefile.PL
index 21e37e7..2570bff 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -6,8 +6,8 @@ author('Best Practical Solutions <sales at bestpractical.com>');
 all_from('lib/RT/IR.pm');
 
 # update README and docs/UPGRADING
-requires_rt('4.0.14');
-rt_too_new('4.2.0',"\nRTIR 3.0.x is only compatible with RT 4.0.x and you are using RT %s\n");
+requires_rt('4.2.3');
+rt_too_new('4.4.0',"\nRTIR 3.2.x is only compatible with RT 4.2.x and you are using RT %s\n");
 
 # XXX: This should be reported by M::I::RTx
 my ($lib_path) = $INC{'RT.pm'} =~ /^(.*)[\\\/]/;
diff --git a/README b/README
index e6d8e1e..7d80b7c 100644
--- a/README
+++ b/README
@@ -14,7 +14,7 @@ touch with us at <sales at bestpractical.com>.
 REQUIRED PACKAGES:
 ------------------
 
-o   RT 4.0.14 or later, configured, installed and tested.
+o   RT 4.2.3 or other releases of the 4.2 series.
 o   Net::Whois::RIPE 1.31 is bundled with RTIR for compatibility with the
     API RTIR uses and for a fix to run without warnings under perl 5.18.
 
@@ -29,7 +29,7 @@ information.
 Installation instructions:
 --------------------------
 
-1) Install RT 4.0.0 or newer following RT's regular installation instructions
+1) Install the current release of the RT 4.2 series following RT's regular installation instructions
 
 2) Run "perl Makefile.PL" to generate a makefile for RTIR.
 
diff --git a/docs/UPGRADING b/docs/UPGRADING
index 482688d..7da2573 100644
--- a/docs/UPGRADING
+++ b/docs/UPGRADING
@@ -24,12 +24,12 @@ lose data.
 
 =item 2
 
-Upgrade your RT installation to RT 4.0.14 or newer following
+Upgrade your RT installation to RT 4.2.3 or newer following
 its upgrade instructions. Make sure you follow all of the
 steps and upgrade both the code and the database.
 
 As noted in the RT documentation, it is recommended that you
-use a fresh directory when upgrading to RT 4.0, like /opt/rt4,
+use a fresh directory when upgrading to RT 4, like /opt/rt4,
 rather than upgrading on top of your RT 3 installation.
 A lot of files have been deleted and moved around in RTIR 3.0,
 so don't copy old RTIR's files.
diff --git a/inc/Module/Install/RTx.pm b/inc/Module/Install/RTx.pm
index b2c1e0c..00cf565 100644
--- a/inc/Module/Install/RTx.pm
+++ b/inc/Module/Install/RTx.pm
@@ -8,7 +8,7 @@ no warnings 'once';
 
 use Module::Install::Base;
 use base 'Module::Install::Base';
-our $VERSION = '0.32_01';
+our $VERSION = '0.33';
 
 use FindBin;
 use File::Glob     ();
@@ -136,7 +136,9 @@ install ::
         $has_etc{acl}++;
     }
     if ( -e 'etc/initialdata' ) { $has_etc{initialdata}++; }
-    if ( -d 'etc/upgrade/' )    { $has_etc{upgrade}++; }
+    if ( grep { /\d+\.\d+\.\d+.*$/ } glob('etc/upgrade/*.*.*') ) {
+        $has_etc{upgrade}++;
+    }
 
     $self->postamble("$postamble\n");
     unless ( $subdirs{'lib'} ) {
@@ -191,7 +193,7 @@ sub requires_rt {
 
 sub rt_too_new {
     my ($self,$version,$msg) = @_;
-    $msg ||= "Your version %s is too new, this extension requires a release of RT older than %s";
+    $msg ||= "Your version %s is too new, this extension requires a release of RT older than %s\n";
 
     _load_rt_handle();
     my @sorted = sort RT::Handle::cmp_version $version,$RT::VERSION;
@@ -220,4 +222,4 @@ sub _load_rt_handle {
 
 __END__
 
-#line 360
+#line 362

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.