Author: stevehay
Date: Thu Jun 12 07:39:23 2014
New Revision: 1602081
URL: http://svn.apache.org/r1602081
Log:
Merge the only thing on trunk that isn't already in httpd24threading into
httpd24threading ahead of merging everything back to trunk. This is purely for
the sake of my sanity...
Modified:
perl/modperl/branches/httpd24threading/ (props changed)
perl/modperl/branches/httpd24threading/build/make_rpm_spec
perl/modperl/branches/httpd24threading/build/win32_fetch_apxs
Propchange: perl/modperl/branches/httpd24threading/
------------------------------------------------------------------------------
Merged /perl/modperl/trunk:r1560449
Modified: perl/modperl/branches/httpd24threading/build/make_rpm_spec
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/httpd24threading/build/make_rpm_spec?rev=1602081&r1=1602080&r2=1602081&view=diff
==============================================================================
--- perl/modperl/branches/httpd24threading/build/make_rpm_spec (original)
+++ perl/modperl/branches/httpd24threading/build/make_rpm_spec Thu Jun 12
07:39:23 2014
@@ -16,7 +16,7 @@ open(my $spec, ">mod_perl.spec") || die
print $spec <<"EOF";
%define _version $mod_perl2::VERSION_TRIPLET
%define _release $release
-%define _source http://perl.apache.org/dist/$tarname
+%define _source http://apache.org/dist/perl/$tarname
%define _dirname $path
%define _httpd_min_ver $httpd_ver
%define _perl_min_ver 5.6.1
Modified: perl/modperl/branches/httpd24threading/build/win32_fetch_apxs
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/httpd24threading/build/win32_fetch_apxs?rev=1602081&r1=1602080&r2=1602081&view=diff
==============================================================================
--- perl/modperl/branches/httpd24threading/build/win32_fetch_apxs (original)
+++ perl/modperl/branches/httpd24threading/build/win32_fetch_apxs Thu Jun 12
07:39:23 2014
@@ -49,7 +49,7 @@ but a development port is available. You
- install apxs by answering "yes" at the prompt below,
- quit now, run the "fetch_win32_apxs.pl" script in the build/ directory
to fetch and install the utilities, and then rebuild mod_perl,
-- quit now, and from http://perl.apache.org/dist/win32-bin/ grab
+- quit now, and from http://apache.org/dist/perl/win32-bin/ grab
apxs_win32.tar.gz; when unpacked, this contains a README explaining
how to install the utilities. Afterwards, rebuild mod_perl.
----------------------------------------------------------------------
@@ -72,7 +72,7 @@ LWP::Simple->import(qw(is_success getsto
my $file = 'apxs_win32.tar.gz';
unless (-e $file) {
- my $remote = 'http://perl.apache.org/dist/win32-bin/' . $file;
+ my $remote = 'http://apache.org/dist/perl/win32-bin/' . $file;
print "Fetching $remote ... ";
die "Download of $remote failed"
unless (is_success(getstore($remote, $file)));
