Hello community,
here is the log from the commit of package perl-HTML-RewriteAttributes for
openSUSE:Factory checked in at 2013-01-20 08:10:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-HTML-RewriteAttributes (Old)
and /work/SRC/openSUSE:Factory/.perl-HTML-RewriteAttributes.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-HTML-RewriteAttributes", Maintainer is ""
Changes:
--------
---
/work/SRC/openSUSE:Factory/perl-HTML-RewriteAttributes/perl-HTML-RewriteAttributes.changes
2011-09-23 12:37:20.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.perl-HTML-RewriteAttributes.new/perl-HTML-RewriteAttributes.changes
2013-01-20 08:10:14.000000000 +0100
@@ -1,0 +2,9 @@
+Thu Jan 17 13:03:09 UTC 2013 - [email protected]
+
+- Update to version 0.05
+ * Resources: Preserve the media attribute when inlining CSS
+ * Resources: Avoid uninitialized warnings by checking the
+ attributes we expect
+- Update source URL
+
+-------------------------------------------------------------------
Old:
----
HTML-RewriteAttributes-0.04.tar.gz
New:
----
HTML-RewriteAttributes-0.05.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-HTML-RewriteAttributes.spec ++++++
--- /var/tmp/diff_new_pack.aMhefe/_old 2013-01-20 08:10:15.000000000 +0100
+++ /var/tmp/diff_new_pack.aMhefe/_new 2013-01-20 08:10:15.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package perl-HTML-RewriteAttributes (Version 0.04)
+# spec file for package perl-HTML-RewriteAttributes
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,18 +15,16 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: perl-HTML-RewriteAttributes
-Version: 0.04
-Release: 1
-License: GPL-1.0+ or Artistic-1.0
+Version: 0.05
+Release: 0
%define cpan_name HTML-RewriteAttributes
Summary: Concise attribute rewriting
-Url: http://search.cpan.org/dist/HTML-RewriteAttributes/
+License: GPL-1.0+ or Artistic-1.0
Group: Development/Libraries/Perl
-Source:
http://www.cpan.org/authors/id/S/SA/SARTAK/HTML-RewriteAttributes-%{version}.tar.gz
+Url: http://search.cpan.org/dist/HTML-RewriteAttributes/
+Source:
http://search.cpan.org/CPAN/authors/id/T/TS/TSIBLEY/HTML-RewriteAttributes-%{version}.tar.gz
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{perl_requires}
++++++ HTML-RewriteAttributes-0.04.tar.gz -> HTML-RewriteAttributes-0.05.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/HTML-RewriteAttributes-0.04/Changes
new/HTML-RewriteAttributes-0.05/Changes
--- old/HTML-RewriteAttributes-0.04/Changes 2010-11-18 22:57:06.000000000
+0100
+++ new/HTML-RewriteAttributes-0.05/Changes 2012-10-23 00:13:42.000000000
+0200
@@ -1,5 +1,9 @@
Revision history for HTML-RewriteAttributes
+0.05 Mon Oct 22 2012
+ Resources: Preserve the media attribute when inlining CSS
+ Resources: Avoid uninitialized warnings by checking the attributes we
expect
+
0.04 Thu Nov 18 2010
Resources: Ignore @import statements that appear in comments
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/HTML-RewriteAttributes-0.04/MANIFEST
new/HTML-RewriteAttributes-0.05/MANIFEST
--- old/HTML-RewriteAttributes-0.04/MANIFEST 2010-11-18 22:57:09.000000000
+0100
+++ new/HTML-RewriteAttributes-0.05/MANIFEST 2012-10-23 00:14:16.000000000
+0200
@@ -5,6 +5,7 @@
inc/Module/Install/Fetch.pm
inc/Module/Install/Makefile.pm
inc/Module/Install/Metadata.pm
+inc/Module/Install/ReadmeFromPod.pm
inc/Module/Install/Win32.pm
inc/Module/Install/WriteAll.pm
lib/HTML/RewriteAttributes.pm
@@ -12,7 +13,9 @@
lib/HTML/RewriteAttributes/Resources.pm
Makefile.PL
MANIFEST This list of files
+MANIFEST.SKIP
META.yml
+README
t/000-synopsis.t
t/001-basic.t
t/002-resources.t
@@ -24,3 +27,4 @@
t/021-import.t
t/022-import-off.t
t/023-import-comment.t
+SIGNATURE Public-key signature (added by
MakeMaker)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/HTML-RewriteAttributes-0.04/MANIFEST.SKIP
new/HTML-RewriteAttributes-0.05/MANIFEST.SKIP
--- old/HTML-RewriteAttributes-0.04/MANIFEST.SKIP 1970-01-01
01:00:00.000000000 +0100
+++ new/HTML-RewriteAttributes-0.05/MANIFEST.SKIP 2012-10-23
00:13:42.000000000 +0200
@@ -0,0 +1,66 @@
+
+#!start included
/opt/perlbrew/perls/perl-5.14.1/lib/5.14.1/ExtUtils/MANIFEST.SKIP
+# Avoid version control files.
+\bRCS\b
+\bCVS\b
+\bSCCS\b
+,v$
+\B\.svn\b
+\B\.git\b
+\B\.gitignore\b
+\b_darcs\b
+\B\.cvsignore$
+
+# Avoid VMS specific MakeMaker generated files
+\bDescrip.MMS$
+\bDESCRIP.MMS$
+\bdescrip.mms$
+
+# Avoid Makemaker generated and utility files.
+\bMANIFEST\.bak
+\bMakefile$
+\bblib/
+\bMakeMaker-\d
+\bpm_to_blib\.ts$
+\bpm_to_blib$
+\bblibdirs\.ts$ # 6.18 through 6.25 generated this
+
+# Avoid Module::Build generated and utility files.
+\bBuild$
+\b_build/
+\bBuild.bat$
+\bBuild.COM$
+\bBUILD.COM$
+\bbuild.com$
+
+# Avoid temp and backup files.
+~$
+\.old$
+\#$
+\b\.#
+\.bak$
+\.tmp$
+\.#
+\.rej$
+
+# Avoid OS-specific files/dirs
+# Mac OSX metadata
+\B\.DS_Store
+# Mac OSX SMB mount metadata files
+\B\._
+
+# Avoid Devel::Cover and Devel::CoverX::Covered files.
+\bcover_db\b
+\bcovered\b
+
+# Avoid MYMETA files
+^MYMETA\.
+#!end included
/opt/perlbrew/perls/perl-5.14.1/lib/5.14.1/ExtUtils/MANIFEST.SKIP
+
+
+# Dist droppings
+^MYMETA\.
+\.tar\.gz$
+
+# ctags files
+^\.tags
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/HTML-RewriteAttributes-0.04/META.yml
new/HTML-RewriteAttributes-0.05/META.yml
--- old/HTML-RewriteAttributes-0.04/META.yml 2010-11-18 22:57:07.000000000
+0100
+++ new/HTML-RewriteAttributes-0.05/META.yml 2012-10-23 00:14:11.000000000
+0200
@@ -3,11 +3,12 @@
author:
- 'Shawn M Moore, C<< <[email protected]> >>'
build_requires:
- ExtUtils::MakeMaker: 6.42
+ ExtUtils::MakeMaker: 6.36
configure_requires:
- ExtUtils::MakeMaker: 6.42
+ ExtUtils::MakeMaker: 6.36
distribution_type: module
-generated_by: 'Module::Install version 1.00'
+dynamic_config: 1
+generated_by: 'Module::Install version 1.06'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -24,4 +25,4 @@
URI: 0
resources:
license: http://dev.perl.org/licenses/
-version: 0.04
+version: 0.05
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/HTML-RewriteAttributes-0.04/Makefile.PL
new/HTML-RewriteAttributes-0.05/Makefile.PL
--- old/HTML-RewriteAttributes-0.04/Makefile.PL 2010-11-18 22:45:19.000000000
+0100
+++ new/HTML-RewriteAttributes-0.05/Makefile.PL 2012-10-22 23:56:56.000000000
+0200
@@ -3,11 +3,13 @@
# Define metadata
name 'HTML-RewriteAttributes';
all_from 'lib/HTML/RewriteAttributes.pm';
+readme_from 'lib/HTML/RewriteAttributes.pm';
requires 'HTML::Parser';
requires 'HTML::Entities';
requires 'HTML::Tagset';
requires 'URI';
+sign;
WriteAll;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/HTML-RewriteAttributes-0.04/README
new/HTML-RewriteAttributes-0.05/README
--- old/HTML-RewriteAttributes-0.04/README 1970-01-01 01:00:00.000000000
+0100
+++ new/HTML-RewriteAttributes-0.05/README 2012-10-23 00:14:10.000000000
+0200
@@ -0,0 +1,76 @@
+NAME
+ HTML::RewriteAttributes - concise attribute rewriting
+
+SYNOPSIS
+ $html = HTML::RewriteAttributes->rewrite($html, sub {
+ my ($tag, $attr, $value) = @_;
+
+ # delete any attribute that mentions..
+ return if $value =~ /COBOL/i;
+
+ $value =~ s/\brocks\b/rules/g;
+ return $value;
+ });
+
+
+ # writing some HTML email I see..
+ $html = HTML::RewriteAttributes::Resources->rewrite($html, sub {
+ my $uri = shift;
+ my $content = render_template($uri);
+ my $cid = generate_cid_from($content);
+ $mime->attach($cid => content);
+ return "cid:$cid";
+ });
+
+
+ # up for some HTML::ResolveLink?
+ $html = HTML::RewriteAttributes::Links->rewrite($html,
"http://search.cpan.org";);
+
+ # or perhaps HTML::LinkExtor?
+ HTML::RewriteAttributes::Links->rewrite($html, sub {
+ my ($tag, $attr, $value) = @_;
+ push @links, $value;
+ $value;
+ });
+
+DESCRIPTION
+ "HTML::RewriteAttributes" is designed for simple yet powerful HTML
+ attribute rewriting.
+
+ You simply specify a callback to run for each attribute and we do the
+ rest for you.
+
+ This module is designed to be subclassable to make handling special
+ cases eaiser. See the source for methods you can override.
+
+METHODS
+ "new"
+ You don't need to call "new" explicitly - it's done in "rewrite". It
+ takes no arguments.
+
+ "rewrite" HTML, callback -> HTML
+ This is the main interface of the module. You pass in some HTML and a
+ callback, the callback is invoked potentially many times, and you get
+ back some similar HTML.
+
+ The callback receives as arguments the tag name, the attribute name, and
+ the attribute value (though subclasses may override this --
+ HTML::RewriteAttributes::Resources does). Return "undef" to remove the
+ attribute, or any other value to set the value of the attribute.
+
+SEE ALSO
+ HTML::Parser, HTML::ResolveLink, Email::MIME::CreateHTML,
+ HTML::LinkExtor
+
+THANKS
+ Some code was inspired by, and tests borrowed from, Miyagawa's
+ HTML::ResolveLink.
+
+AUTHOR
+ Shawn M Moore, "<[email protected]>"
+
+LICENSE
+ Copyright 2008-2010 Best Practical Solutions, LLC.
+ HTML::RewriteAttributes is distributed under the same terms as Perl
+ itself.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/HTML-RewriteAttributes-0.04/SIGNATURE
new/HTML-RewriteAttributes-0.05/SIGNATURE
--- old/HTML-RewriteAttributes-0.04/SIGNATURE 1970-01-01 01:00:00.000000000
+0100
+++ new/HTML-RewriteAttributes-0.05/SIGNATURE 2012-10-23 00:14:16.000000000
+0200
@@ -0,0 +1,52 @@
+This file contains message digests of all files listed in MANIFEST,
+signed via the Module::Signature module, version 0.68.
+
+To verify the content in this distribution, first make sure you have
+Module::Signature installed, then type:
+
+ % cpansign -v
+
+It will check each file's integrity, as well as the signature's
+validity. If "==> Signature verified OK! <==" is not displayed,
+the distribution may already have been compromised, and you should
+not run its Makefile.PL or Build.PL.
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+SHA1 d0e286477b95832aa494f325113e7e320b44e73e Changes
+SHA1 944e15e3414d90d1e4fdb456b1c4a7efa0a7c8ca MANIFEST
+SHA1 45c5a75eda6089e9e23fad201b41f63b8c9bb504 MANIFEST.SKIP
+SHA1 bbd2da5709def05d6b55e4d829072610cdd3651a META.yml
+SHA1 710580665bac8a12510c1a1db12aa6f84e0a611f Makefile.PL
+SHA1 b79b7618ecea16ce2d48091efffd69d16f42005d README
+SHA1 8a924add836b60fb23b25c8506d45945e02f42f4 inc/Module/Install.pm
+SHA1 2d0fad3bf255f8c1e7e1e34eafccc4f595603ddc inc/Module/Install/Base.pm
+SHA1 f0e01fff7d73cd145fbf22331579918d4628ddb0 inc/Module/Install/Can.pm
+SHA1 7328966e4fda0c8451a6d3850704da0b84ac1540 inc/Module/Install/Fetch.pm
+SHA1 b62ca5e2d58fa66766ccf4d64574f9e1a2250b34 inc/Module/Install/Makefile.pm
+SHA1 1aa925be410bb3bfcd84a16985921f66073cc1d2 inc/Module/Install/Metadata.pm
+SHA1 a3cff7ab08b95ee312b7e9381eb72f42e309c842
inc/Module/Install/ReadmeFromPod.pm
+SHA1 e4196994fa75e98bdfa2be0bdeeffef66de88171 inc/Module/Install/Win32.pm
+SHA1 c3a6d0d5b84feb3280622e9599e86247d58b0d18 inc/Module/Install/WriteAll.pm
+SHA1 f3bae457e4bbec8afcf6abefea8161427308c1ce lib/HTML/RewriteAttributes.pm
+SHA1 50b0d8f9eaf6a40fd1e34bc2744d41d8a1b3a477
lib/HTML/RewriteAttributes/Links.pm
+SHA1 ba9643a4435368494357328454e4bb2a185d55a0
lib/HTML/RewriteAttributes/Resources.pm
+SHA1 5d97ad6516b8aea70d9979934492c8cbe7e88409 t/000-synopsis.t
+SHA1 ee0edb567e91ef5fc3df0e1c0771776b229e2aa2 t/001-basic.t
+SHA1 7fb822373f163cdb0fb54bd2a9f55dabe36e025f t/002-resources.t
+SHA1 3c749328abb70da542ca0e42602fb6456a9d9780 t/003-links.t
+SHA1 301b59c6176775286333388dc539d524f3ee1635 t/004-misc.t
+SHA1 3269dcbb500cb5d4905ed442c030fedac40bea34 t/005-links-code.t
+SHA1 c511d1917a9ea1e486e643193c8ca99e8522f11e t/010-resolvelink.t
+SHA1 a451823d4e5961b24202618b99cac7c79e641b05 t/020-inline-css.t
+SHA1 a901c2673f095455484bf8fe493768fe292e68fa t/021-import.t
+SHA1 33065c367ab56b3a7bcdd55afb920828f52086c3 t/022-import-off.t
+SHA1 5df911d7ef2cfb8566628153cd565c4da1aa723d t/023-import-comment.t
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iD8DBQFQhcU4Hdv9ZfNcOAcRAgBmAJ9GyWI/6iOU7ONziG7rSq9NxUdCDQCfZFAO
+XXl0MHJLJLNol1vjzNI7o94=
+=ID9F
+-----END PGP SIGNATURE-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/HTML-RewriteAttributes-0.04/inc/Module/Install/Base.pm
new/HTML-RewriteAttributes-0.05/inc/Module/Install/Base.pm
--- old/HTML-RewriteAttributes-0.04/inc/Module/Install/Base.pm 2010-11-18
22:57:07.000000000 +0100
+++ new/HTML-RewriteAttributes-0.05/inc/Module/Install/Base.pm 2012-10-23
00:14:10.000000000 +0200
@@ -4,7 +4,7 @@
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.06';
}
# Suspend handler for "redefined" warnings
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/HTML-RewriteAttributes-0.04/inc/Module/Install/Can.pm
new/HTML-RewriteAttributes-0.05/inc/Module/Install/Can.pm
--- old/HTML-RewriteAttributes-0.04/inc/Module/Install/Can.pm 2010-11-18
22:57:07.000000000 +0100
+++ new/HTML-RewriteAttributes-0.05/inc/Module/Install/Can.pm 2012-10-23
00:14:10.000000000 +0200
@@ -3,13 +3,12 @@
use strict;
use Config ();
-use File::Spec ();
use ExtUtils::MakeMaker ();
use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -29,7 +28,7 @@
eval { require $mod; $pkg->VERSION($ver || 0); 1 };
}
-# check if we can run some command
+# Check if we can run some command
sub can_run {
my ($self, $cmd) = @_;
@@ -38,14 +37,88 @@
for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
next if $dir eq '';
- my $abs = File::Spec->catfile($dir, $_[1]);
+ require File::Spec;
+ my $abs = File::Spec->catfile($dir, $cmd);
return $abs if (-x $abs or $abs = MM->maybe_command($abs));
}
return;
}
-# can we locate a (the) C compiler
+# Can our C compiler environment build XS files
+sub can_xs {
+ my $self = shift;
+
+ # Ensure we have the CBuilder module
+ $self->configure_requires( 'ExtUtils::CBuilder' => 0.27 );
+
+ # Do we have the configure_requires checker?
+ local $@;
+ eval "require ExtUtils::CBuilder;";
+ if ( $@ ) {
+ # They don't obey configure_requires, so it is
+ # someone old and delicate. Try to avoid hurting
+ # them by falling back to an older simpler test.
+ return $self->can_cc();
+ }
+
+ # Do we have a working C compiler
+ my $builder = ExtUtils::CBuilder->new(
+ quiet => 1,
+ );
+ unless ( $builder->have_compiler ) {
+ # No working C compiler
+ return 0;
+ }
+
+ # Write a C file representative of what XS becomes
+ require File::Temp;
+ my ( $FH, $tmpfile ) = File::Temp::tempfile(
+ "compilexs-XXXXX",
+ SUFFIX => '.c',
+ );
+ binmode $FH;
+ print $FH <<'END_C';
+#include "EXTERN.h"
+#include "perl.h"
+#include "XSUB.h"
+
+int main(int argc, char **argv) {
+ return 0;
+}
+
+int boot_sanexs() {
+ return 1;
+}
+
+END_C
+ close $FH;
+
+ # Can the C compiler access the same headers XS does
+ my @libs = ();
+ my $object = undef;
+ eval {
+ local $^W = 0;
+ $object = $builder->compile(
+ source => $tmpfile,
+ );
+ @libs = $builder->link(
+ objects => $object,
+ module_name => 'sanexs',
+ );
+ };
+ my $result = $@ ? 0 : 1;
+
+ # Clean up all the build files
+ foreach ( $tmpfile, $object, @libs ) {
+ next unless defined $_;
+ 1 while unlink;
+ }
+
+ return $result;
+}
+
+# Can we locate a (the) C compiler
sub can_cc {
my $self = shift;
my @chunks = split(/ /, $Config::Config{cc}) or return;
@@ -78,4 +151,4 @@
__END__
-#line 156
+#line 236
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/HTML-RewriteAttributes-0.04/inc/Module/Install/Fetch.pm
new/HTML-RewriteAttributes-0.05/inc/Module/Install/Fetch.pm
--- old/HTML-RewriteAttributes-0.04/inc/Module/Install/Fetch.pm 2010-11-18
22:57:07.000000000 +0100
+++ new/HTML-RewriteAttributes-0.05/inc/Module/Install/Fetch.pm 2012-10-23
00:14:10.000000000 +0200
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/HTML-RewriteAttributes-0.04/inc/Module/Install/Makefile.pm
new/HTML-RewriteAttributes-0.05/inc/Module/Install/Makefile.pm
--- old/HTML-RewriteAttributes-0.04/inc/Module/Install/Makefile.pm
2010-11-18 22:57:07.000000000 +0100
+++ new/HTML-RewriteAttributes-0.05/inc/Module/Install/Makefile.pm
2012-10-23 00:14:10.000000000 +0200
@@ -8,7 +8,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -215,18 +215,22 @@
require ExtUtils::MakeMaker;
if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) {
- # MakeMaker can complain about module versions that include
- # an underscore, even though its own version may contain one!
- # Hence the funny regexp to get rid of it. See RT #35800
- # for details.
- my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/;
- $self->build_requires( 'ExtUtils::MakeMaker' => $v );
- $self->configure_requires( 'ExtUtils::MakeMaker' => $v );
+ # This previous attempted to inherit the version of
+ # ExtUtils::MakeMaker in use by the module author, but this
+ # was found to be untenable as some authors build releases
+ # using future dev versions of EU:MM that nobody else has.
+ # Instead, #toolchain suggests we use 6.59 which is the most
+ # stable version on CPAN at time of writing and is, to quote
+ # ribasushi, "not terminally fucked, > and tested enough".
+ # TODO: We will now need to maintain this over time to push
+ # the version up as new versions are released.
+ $self->build_requires( 'ExtUtils::MakeMaker' => 6.59 );
+ $self->configure_requires( 'ExtUtils::MakeMaker' => 6.59 );
} else {
# Allow legacy-compatibility with 5.005 by depending on the
# most recent EU:MM that supported 5.005.
- $self->build_requires( 'ExtUtils::MakeMaker' => 6.42 );
- $self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 );
+ $self->build_requires( 'ExtUtils::MakeMaker' => 6.36 );
+ $self->configure_requires( 'ExtUtils::MakeMaker' => 6.36 );
}
# Generate the MakeMaker params
@@ -241,7 +245,6 @@
'all_from' if you prefer) in Makefile.PL.
EOT
- $DB::single = 1;
if ( $self->tests ) {
my @tests = split ' ', $self->tests;
my %seen;
@@ -412,4 +415,4 @@
__END__
-#line 541
+#line 544
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/HTML-RewriteAttributes-0.04/inc/Module/Install/Metadata.pm
new/HTML-RewriteAttributes-0.05/inc/Module/Install/Metadata.pm
--- old/HTML-RewriteAttributes-0.04/inc/Module/Install/Metadata.pm
2010-11-18 22:57:07.000000000 +0100
+++ new/HTML-RewriteAttributes-0.05/inc/Module/Install/Metadata.pm
2012-10-23 00:14:10.000000000 +0200
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -151,15 +151,21 @@
sub install_as_vendor { $_[0]->installdirs('vendor') }
sub dynamic_config {
- my $self = shift;
- unless ( @_ ) {
- warn "You MUST provide an explicit true/false value to
dynamic_config\n";
- return $self;
+ my $self = shift;
+ my $value = @_ ? shift : 1;
+ if ( $self->{values}->{dynamic_config} ) {
+ # Once dynamic we never change to static, for safety
+ return 0;
}
- $self->{values}->{dynamic_config} = $_[0] ? 1 : 0;
+ $self->{values}->{dynamic_config} = $value ? 1 : 0;
return 1;
}
+# Convenience command
+sub static_config {
+ shift->dynamic_config(0);
+}
+
sub perl_version {
my $self = shift;
return $self->{values}->{perl_version} unless @_;
@@ -170,7 +176,7 @@
# Normalize the version
$version = $self->_perl_version($version);
- # We don't support the reall old versions
+ # We don't support the really old versions
unless ( $version >= 5.005 ) {
die "Module::Install only supports 5.005 or newer (use
ExtUtils::MakeMaker)\n";
}
@@ -515,6 +521,7 @@
'GNU Free Documentation license' => 'unrestricted', 1,
'GNU Affero General Public License' => 'open_source', 1,
'(?:Free)?BSD license' => 'bsd', 1,
+ 'Artistic license 2\.0' => 'artistic_2', 1,
'Artistic license' => 'artistic', 1,
'Apache (?:Software )?license' => 'apache', 1,
'GPL' => 'gpl', 1,
@@ -550,9 +557,9 @@
sub _extract_bugtracker {
my @links = $_[0] =~ m#L<(
- \Qhttp://rt.cpan.org/\E[^>]+|
- \Qhttp://github.com/\E[\w_]+/[\w_]+/issues|
- \Qhttp://code.google.com/p/\E[\w_\-]+/issues/list
+ https?\Q://rt.cpan.org/\E[^>]+|
+ https?\Q://github.com/\E[\w_]+/[\w_]+/issues|
+ https?\Q://code.google.com/p/\E[\w_\-]+/issues/list
)>#gx;
my %links;
@links{@links}=();
@@ -581,7 +588,7 @@
sub requires_from {
my $self = shift;
my $content = Module::Install::_readperl($_[0]);
- my @requires = $content =~
m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
+ my @requires = $content =~
m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+(v?[\d\.]+)/mg;
while ( @requires ) {
my $module = shift @requires;
my $version = shift @requires;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/HTML-RewriteAttributes-0.04/inc/Module/Install/ReadmeFromPod.pm
new/HTML-RewriteAttributes-0.05/inc/Module/Install/ReadmeFromPod.pm
--- old/HTML-RewriteAttributes-0.04/inc/Module/Install/ReadmeFromPod.pm
1970-01-01 01:00:00.000000000 +0100
+++ new/HTML-RewriteAttributes-0.05/inc/Module/Install/ReadmeFromPod.pm
2012-10-23 00:14:10.000000000 +0200
@@ -0,0 +1,138 @@
+#line 1
+package Module::Install::ReadmeFromPod;
+
+use 5.006;
+use strict;
+use warnings;
+use base qw(Module::Install::Base);
+use vars qw($VERSION);
+
+$VERSION = '0.18';
+
+sub readme_from {
+ my $self = shift;
+ return unless $self->is_admin;
+
+ # Input file
+ my $in_file = shift || $self->_all_from
+ or die "Can't determine file to make readme_from";
+
+ # Get optional arguments
+ my ($clean, $format, $out_file, $options);
+ my $args = shift;
+ if ( ref $args ) {
+ # Arguments are in a hashref
+ if ( ref($args) ne 'HASH' ) {
+ die "Expected a hashref but got a ".ref($args)."\n";
+ } else {
+ $clean = $args->{'clean'};
+ $format = $args->{'format'};
+ $out_file = $args->{'output_file'};
+ $options = $args->{'options'};
+ }
+ } else {
+ # Arguments are in a list
+ $clean = $args;
+ $format = shift;
+ $out_file = shift;
+ $options = \@_;
+ }
+
+ # Default values;
+ $clean ||= 0;
+ $format ||= 'txt';
+
+ # Generate README
+ print "readme_from $in_file to $format\n";
+ if ($format =~ m/te?xt/) {
+ $out_file = $self->_readme_txt($in_file, $out_file, $options);
+ } elsif ($format =~ m/html?/) {
+ $out_file = $self->_readme_htm($in_file, $out_file, $options);
+ } elsif ($format eq 'man') {
+ $out_file = $self->_readme_man($in_file, $out_file, $options);
+ } elsif ($format eq 'pdf') {
+ $out_file = $self->_readme_pdf($in_file, $out_file, $options);
+ }
+
+ if ($clean) {
+ $self->clean_files($out_file);
+ }
+
+ return 1;
+}
+
+
+sub _readme_txt {
+ my ($self, $in_file, $out_file, $options) = @_;
+ $out_file ||= 'README';
+ require Pod::Text;
+ my $parser = Pod::Text->new( @$options );
+ open my $out_fh, '>', $out_file or die "Could not write file
$out_file:\n$!\n";
+ $parser->output_fh( *$out_fh );
+ $parser->parse_file( $in_file );
+ close $out_fh;
+ return $out_file;
+}
+
+
+sub _readme_htm {
+ my ($self, $in_file, $out_file, $options) = @_;
+ $out_file ||= 'README.htm';
+ require Pod::Html;
+ Pod::Html::pod2html(
+ "--infile=$in_file",
+ "--outfile=$out_file",
+ @$options,
+ );
+ # Remove temporary files if needed
+ for my $file ('pod2htmd.tmp', 'pod2htmi.tmp') {
+ if (-e $file) {
+ unlink $file or warn "Warning: Could not remove file '$file'.\n$!\n";
+ }
+ }
+ return $out_file;
+}
+
+
+sub _readme_man {
+ my ($self, $in_file, $out_file, $options) = @_;
+ $out_file ||= 'README.1';
+ require Pod::Man;
+ my $parser = Pod::Man->new( @$options );
+ $parser->parse_from_file($in_file, $out_file);
+ return $out_file;
+}
+
+
+sub _readme_pdf {
+ my ($self, $in_file, $out_file, $options) = @_;
+ $out_file ||= 'README.pdf';
+ eval { require App::pod2pdf; }
+ or die "Could not generate $out_file because pod2pdf could not be found\n";
+ my $parser = App::pod2pdf->new( @$options );
+ $parser->parse_from_file($in_file);
+ open my $out_fh, '>', $out_file or die "Could not write file
$out_file:\n$!\n";
+ select $out_fh;
+ $parser->output;
+ select STDOUT;
+ close $out_fh;
+ return $out_file;
+}
+
+
+sub _all_from {
+ my $self = shift;
+ return unless $self->admin->{extensions};
+ my ($metadata) = grep {
+ ref($_) eq 'Module::Install::Metadata';
+ } @{$self->admin->{extensions}};
+ return unless $metadata;
+ return $metadata->{values}{all_from} || '';
+}
+
+'Readme!';
+
+__END__
+
+#line 254
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/HTML-RewriteAttributes-0.04/inc/Module/Install/Win32.pm
new/HTML-RewriteAttributes-0.05/inc/Module/Install/Win32.pm
--- old/HTML-RewriteAttributes-0.04/inc/Module/Install/Win32.pm 2010-11-18
22:57:07.000000000 +0100
+++ new/HTML-RewriteAttributes-0.05/inc/Module/Install/Win32.pm 2012-10-23
00:14:10.000000000 +0200
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/HTML-RewriteAttributes-0.04/inc/Module/Install/WriteAll.pm
new/HTML-RewriteAttributes-0.05/inc/Module/Install/WriteAll.pm
--- old/HTML-RewriteAttributes-0.04/inc/Module/Install/WriteAll.pm
2010-11-18 22:57:07.000000000 +0100
+++ new/HTML-RewriteAttributes-0.05/inc/Module/Install/WriteAll.pm
2012-10-23 00:14:10.000000000 +0200
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '1.06';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/HTML-RewriteAttributes-0.04/inc/Module/Install.pm
new/HTML-RewriteAttributes-0.05/inc/Module/Install.pm
--- old/HTML-RewriteAttributes-0.04/inc/Module/Install.pm 2010-11-18
22:57:06.000000000 +0100
+++ new/HTML-RewriteAttributes-0.05/inc/Module/Install.pm 2012-10-23
00:14:10.000000000 +0200
@@ -31,7 +31,7 @@
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '1.00';
+ $VERSION = '1.06';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -451,7 +451,7 @@
}
sub _cmp ($$) {
- _version($_[0]) <=> _version($_[1]);
+ _version($_[1]) <=> _version($_[2]);
}
# Cloned from Params::Util::_CLASS
@@ -467,4 +467,4 @@
1;
-# Copyright 2008 - 2010 Adam Kennedy.
+# Copyright 2008 - 2012 Adam Kennedy.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/HTML-RewriteAttributes-0.04/lib/HTML/RewriteAttributes/Resources.pm
new/HTML-RewriteAttributes-0.05/lib/HTML/RewriteAttributes/Resources.pm
--- old/HTML-RewriteAttributes-0.04/lib/HTML/RewriteAttributes/Resources.pm
2010-11-18 22:57:05.000000000 +0100
+++ new/HTML-RewriteAttributes-0.05/lib/HTML/RewriteAttributes/Resources.pm
2012-10-22 23:46:17.000000000 +0200
@@ -49,15 +49,17 @@
my ($tag, $attr, $attrseq, $text) = @_;
if ($self->{rewrite_inline_css_cb}) {
- if ($tag eq 'link' && $attr->{type} eq 'text/css') {
+ if ($tag eq 'link' and defined $attr->{type} and $attr->{type} eq
'text/css' and defined $attr->{href}) {
my $content = $self->_import($attr->{href});
if (defined $content) {
$content = $self->_handle_imports($content, $attr->{href});
- $self->{rewrite_html} .= "\n<style
type=\"text/css\">\n<!--\n$content\n-->\n</style>\n";
+ $self->{rewrite_html} .= "\n<style type=\"text/css\"";
+ $self->{rewrite_html} .= " media=\"$attr->{media}\"" if
$attr->{media};
+ $self->{rewrite_html} .= ">\n<!--\n$content\n-->\n</style>\n";
return;
}
}
- if ($tag eq 'style' && $attr->{type} eq 'text/css') {
+ if ($tag eq 'style' and defined $attr->{type} and $attr->{type} eq
'text/css') {
$self->{rewrite_look_for_style} = 1;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/HTML-RewriteAttributes-0.04/lib/HTML/RewriteAttributes.pm
new/HTML-RewriteAttributes-0.05/lib/HTML/RewriteAttributes.pm
--- old/HTML-RewriteAttributes-0.04/lib/HTML/RewriteAttributes.pm
2010-11-18 22:57:06.000000000 +0100
+++ new/HTML-RewriteAttributes-0.05/lib/HTML/RewriteAttributes.pm
2012-10-23 00:13:42.000000000 +0200
@@ -6,7 +6,7 @@
use Carp 'croak';
use HTML::Entities 'encode_entities';
-our $VERSION = '0.04';
+our $VERSION = '0.05';
sub new {
my $class = shift;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/HTML-RewriteAttributes-0.04/t/020-inline-css.t
new/HTML-RewriteAttributes-0.05/t/020-inline-css.t
--- old/HTML-RewriteAttributes-0.04/t/020-inline-css.t 2010-11-18
22:45:19.000000000 +0100
+++ new/HTML-RewriteAttributes-0.05/t/020-inline-css.t 2012-10-22
23:55:04.000000000 +0200
@@ -8,6 +8,7 @@
<html>
<head>
<link type="text/css" href="foo.css" />
+ <link type="text/css" href="print.css" media="print" />
</head>
<body>
<img src="moose.jpg" />
@@ -45,6 +46,7 @@
is_deeply(\@seen_inline, [
"foo.css",
+ "print.css",
]);
is($rewrote, << "END", "rewrote the html correctly");
@@ -58,6 +60,15 @@
INLINED CSS
-->
</style>
+
+
+<style type="text/css" media="print">
+<!--
+
+/* print.css */
+INLINED CSS
+-->
+</style>
</head>
<body>
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
