[Bps-public-commit] RT-Extension-MandatoryOnTransition branch, master, updated. 0.13

[Alex Vandiver]

The branch, master has been updated
       via  91f0fda78a06a43879e111a7a491823d51e81167 (commit)
       via  95b44e0d9dd00c93a585f8514be18004689eff82 (commit)
      from  325270508919a5a80c79ebc6c986d33230499dd1 (commit)

Summary of changes:
 Changes                                   |  4 ++++
 META.yml                                  |  4 ++--
 inc/Module/Install/RTx.pm                 | 29 +++++++++++++++++++++++++----
 lib/RT/Extension/MandatoryOnTransition.pm |  2 +-
 4 files changed, 32 insertions(+), 7 deletions(-)

- Log -----------------------------------------------------------------
commit 95b44e0d9dd00c93a585f8514be18004689eff82
Author: Alex Vandiver <alex at chmrr.net>
Date:   Thu Jul 14 00:39:45 2016 -0700

    Upgrade Module::Install::RTx
    
    a32c49be mistakenly reverted to Module::Install::RTx 0.37 as released,
    rolling back unreleased changes to support `DESTDIR=` and
    `INSTALLDIRS=vendor`.  Re-upgrade to the newly-released 0.38
    containing these features.
    
    Fixes cpan#116138.

diff --git a/META.yml b/META.yml
index 0781b5a..d7a0ace 100644
--- a/META.yml
+++ b/META.yml
@@ -28,5 +28,5 @@ resources:
   license: http://opensource.org/licenses/gpl-license.php
   repository: https://github.com/bestpractical/rt-extension-mandatoryontransition
 version: '0.12'
-x_module_install_rtx_version: '0.37'
+x_module_install_rtx_version: '0.38'
 x_requires_rt: 4.0.9
diff --git a/inc/Module/Install/RTx.pm b/inc/Module/Install/RTx.pm
index 97acf77..80538d3 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.37';
+our $VERSION = '0.38';
 
 use FindBin;
 use File::Glob     ();
@@ -37,6 +37,13 @@ sub RTx {
     }
     $self->add_metadata("x_module_install_rtx_version", $VERSION );
 
+    my $installdirs = $ENV{INSTALLDIRS};
+    for ( @ARGV ) {
+        if ( /INSTALLDIRS=(.*)/ ) {
+            $installdirs = $1;
+        }
+    }
+
     # Try to find RT.pm
     my @prefixes = qw( /opt /usr/local /home /usr /sw /usr/share/request-tracker4);
     $ENV{RTHOME} =~ s{/RT\.pm$}{} if defined $ENV{RTHOME};
@@ -71,7 +78,13 @@ sub RTx {
 
     # Installation locations
     my %path;
-    $path{$_} = $RT::LocalPluginPath . "/$name/$_"
+    my $plugin_path;
+    if ( $installdirs && $installdirs eq 'vendor' ) {
+        $plugin_path = $RT::PluginPath;
+    } else {
+        $plugin_path = $RT::LocalPluginPath;
+    }
+    $path{$_} = $plugin_path . "/$name/$_"
         foreach @DIRS;
 
     # Copy RT 4.2.0 static files into NoAuth; insufficient for
@@ -85,7 +98,7 @@ sub RTx {
     my %index = map { $_ => 1 } @INDEX_DIRS;
     $self->no_index( directory => $_ ) foreach grep !$index{$_}, @DIRS;
 
-    my $args = join ', ', map "q($_)", map { ($_, $path{$_}) }
+    my $args = join ', ', map "q($_)", map { ($_, "\$(DESTDIR)$path{$_}") }
         sort keys %path;
 
     printf "%-10s => %s\n", $_, $path{$_} for sort keys %path;
@@ -131,6 +144,7 @@ install ::
     if ( $path{lib} ) {
         $self->makemaker_args( INSTALLSITELIB => $path{'lib'} );
         $self->makemaker_args( INSTALLARCHLIB => $path{'lib'} );
+        $self->makemaker_args( INSTALLVENDORLIB => $path{'lib'} )
     } else {
         $self->makemaker_args( PM => { "" => "" }, );
     }
@@ -139,6 +153,13 @@ install ::
     $self->makemaker_args( INSTALLSITEMAN3DIR => "$RT::LocalPath/man/man3" );
     $self->makemaker_args( INSTALLSITEARCH => "$RT::LocalPath/man" );
 
+    # INSTALLDIRS=vendor should install manpages into /usr/share/man.
+    # That is the default path in most distributions. Need input from
+    # Redhat, Centos etc.
+    $self->makemaker_args( INSTALLVENDORMAN1DIR => "/usr/share/man/man1" );
+    $self->makemaker_args( INSTALLVENDORMAN3DIR => "/usr/share/man/man3" );
+    $self->makemaker_args( INSTALLVENDORARCH => "/usr/share/man" );
+
     if (%has_etc) {
         print "For first-time installation, type 'make initdb'.\n";
         my $initdb = '';
@@ -258,4 +279,4 @@ sub _load_rt_handle {
 
 __END__
 
-#line 390
+#line 428

commit 91f0fda78a06a43879e111a7a491823d51e81167
Author: Alex Vandiver <alex at chmrr.net>
Date:   Thu Jul 14 00:41:20 2016 -0700

    Version 0.13 releng

diff --git a/Changes b/Changes
index b3958be..fcad7e6 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,7 @@
+0.13 2016-07-14
+- Packaging fixes; reinstate latest Module::Install::RTx.  Fixes
+  cpan#116138.
+
 0.12 2016-07-11
  - Packaging improvements
 
diff --git a/META.yml b/META.yml
index d7a0ace..24417f5 100644
--- a/META.yml
+++ b/META.yml
@@ -27,6 +27,6 @@ requires:
 resources:
   license: http://opensource.org/licenses/gpl-license.php
   repository: https://github.com/bestpractical/rt-extension-mandatoryontransition
-version: '0.12'
+version: '0.13'
 x_module_install_rtx_version: '0.38'
 x_requires_rt: 4.0.9
diff --git a/lib/RT/Extension/MandatoryOnTransition.pm b/lib/RT/Extension/MandatoryOnTransition.pm
index 4a83f7d..ab0337f 100644
--- a/lib/RT/Extension/MandatoryOnTransition.pm
+++ b/lib/RT/Extension/MandatoryOnTransition.pm
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 package RT::Extension::MandatoryOnTransition;
 
-our $VERSION = '0.12';
+our $VERSION = '0.13';
 
 =head1 NAME
 

-----------------------------------------------------------------------