.gear-rules | 2 + .../5d8a3097da2103a2d5a5487ae66683b5351a9757 | 13 +++ .gear-tags/list | 1 + LibXSLT.pm | 15 +--- Makefile.PL | 6 +- perl-XML-LibXSLT.spec | 91 ++++++++++++++++++++ t/13error.t | 2 +- 7 files changed, 115 insertions(+), 15 deletions(-) diff --git a/.gear-rules b/.gear-rules new file mode 100644 index 0000000..0b76189 --- /dev/null +++ b/.gear-rules @@ -0,0 +1,2 @@ +tar: @version@:. name=XML-LibXSLT-@version@ +diff: @version@:. . name=perl-XML-LibXSLT-@version@-@release@.patch diff --git a/.gear-tags/5d8a3097da2103a2d5a5487ae66683b5351a9757 b/.gear-tags/5d8a3097da2103a2d5a5487ae66683b5351a9757 new file mode 100644 index 0000000..568286b --- /dev/null +++ b/.gear-tags/5d8a3097da2103a2d5a5487ae66683b5351a9757 @@ -0,0 +1,13 @@ +object 04a0a799b5c0f6336316a97a6a8947b169113541 +type commit +tag 1.70 +tagger Alexey Tourbin 1269862480 +0400 + +1.70 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.10 (GNU/Linux) + +iEYEABECAAYFAkuwkFAACgkQfBKgtDjnu0aBAACg42SsBMg55CXDOK2CG9HsjFwg +3ZsAoNtUAqnOLI+UvozBdv9H8pINqV7m +=mN00 +-----END PGP SIGNATURE----- diff --git a/.gear-tags/list b/.gear-tags/list new file mode 100644 index 0000000..b299f45 --- /dev/null +++ b/.gear-tags/list @@ -0,0 +1 @@ +5d8a3097da2103a2d5a5487ae66683b5351a9757 1.70 diff --git a/LibXSLT.pm b/LibXSLT.pm index 034f52a..39f09f8 100644 --- a/LibXSLT.pm +++ b/LibXSLT.pm @@ -9,7 +9,7 @@ package XML::LibXSLT; use strict; -use vars qw($VERSION @ISA $USE_LIBXML_DATA_TYPES $MatchCB $ReadCB $OpenCB $CloseCB); +use vars qw($VERSION $USE_LIBXML_DATA_TYPES $MatchCB $ReadCB $OpenCB $CloseCB); sub REQUIRE_XML_LIBXML_ABI_VERSION { 2 } @@ -23,19 +23,10 @@ use XML::LibXML::NodeList; BEGIN { use Carp; -require Exporter; - $VERSION = "1.70"; -require DynaLoader; - -@ISA = qw(DynaLoader); - -# avoid possible shared library name conflict on Win32 -# not using this trick on 5.10.0 (suffering from DynaLoader bug) -local $DynaLoader::dl_dlext = "xs.$DynaLoader::dl_dlext" if (($^O eq 'MSWin32') && ($] ne '5.010000')); - -bootstrap XML::LibXSLT $VERSION; +require XSLoader; +XSLoader::load(__PACKAGE__, $VERSION); # the following magic lets XML::LibXSLT internals know # where to register XML::LibXML proxy nodes diff --git a/Makefile.PL b/Makefile.PL index 670bf75..0cb55b6 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -82,6 +82,8 @@ OPT } } +=pod + if ($config{LIBS} !~ /\-l(lib)?xslt\b/) { # in this case we are not able to run xml2-config. therefore we need to # expand the libz as well. @@ -121,6 +123,8 @@ if ($config{LIBS} !~ /\-lm\b/) { $config{LIBS} .= $is_Win32 ? '' :' -lm'; } +=cut + if (!have_library($is_Win32 ? "libxslt" : "xslt")) { print STDERR <= %version +BuildPreReq: perl-XML-LibXML >= %version + +# Automatically added by buildreq on Thu May 05 2011 +BuildRequires: libxslt-devel perl-Encode perl-XML-LibXML perl-devel + +%description +This module is a fast XSLT library, based on the Gnome libxslt engine. +The libxslt processor is fast, highly standards compliant, with +practically all of XSLT 1.0 being supported in version 0.9 of libxslt. + +%prep +%setup -q -n %dist-%version +%patch -p1 + +%build +%perl_vendor_build INC=-I/usr/include/libxml2 LIBS='-lxslt -lxml2' + +%install +%perl_vendor_install + +%files +%doc Changes README +%dir %perl_vendor_archlib/XML + %perl_vendor_archlib/XML/LibXSLT.pm +%dir %perl_vendor_autolib/XML +%dir %perl_vendor_autolib/XML/LibXSLT + %perl_vendor_autolib/XML/LibXSLT/LibXSLT.so + +%changelog +* Thu May 05 2011 Alexey Tourbin 1.70-alt2 +- fixed building without zlib-devel + +* Sun Nov 07 2010 Vladimir Lettiev 1.70-alt1.1 +- rebuilt with perl 5.12 + +* Mon Mar 29 2010 Alexey Tourbin 1.70-alt1 +- 1.68 -> 1.70 + +* Sat Nov 08 2008 Alexey Tourbin 1.68-alt1 +- 1.66 -> 1.68 + +* Fri Feb 22 2008 Alexey Tourbin 1.66-alt1 +- 1.63 -> 1.66 + +* Sat Oct 27 2007 Alexey Tourbin 1.63-alt1 +- 1.62 -> 1.63 + +* Mon Aug 20 2007 Alexey Tourbin 1.62-alt2 +- changed src.rpm packaging to keep upstream tarball unchanged + +* Tue Nov 21 2006 Alexey Tourbin 1.62-alt1 +- 1.61 -> 1.62 + +* Sat Nov 18 2006 Alexey Tourbin 1.61-alt1 +- 1.60 -> 1.61 +- imported sources into git and built with gear +- fixed test suite for new libxslt-1.1.18 (cpan #23467) + +* Sun Aug 27 2006 Alexey Tourbin 1.60-alt1 +- 1.59 -> 1.60 + +* Thu Aug 10 2006 Alexey Tourbin 1.59-alt1 +- 1.58 -> 1.59 +- benchmark.pl not packaged + +* Mon Aug 08 2005 Alexey Tourbin 1.58-alt1 +- 1.57 -> 1.58 +- manual pages not packaged (use perldoc) + +* Sat Feb 19 2005 ALT QA Team Robot 1.57-alt1.1 +- Rebuilt with rpm-build-perl-0.5.1. + +* Thu Apr 15 2004 Alexey Tourbin 1.57-alt1 +- 1.57, Sisyphus release, thanks to Michael Bochkaryov + +* Fri Apr 9 2004 Michael Bochkaryov 1.53-ks0 +- Initial release diff --git a/t/13error.t b/t/13error.t index d13a298..b4d49e7 100644 --- a/t/13error.t +++ b/t/13error.t @@ -118,4 +118,4 @@ ok( $@ ); ok( $@ =~ /unregistered variable foo|variable 'foo' has not been declared/i ); ok( $@ =~ /element value-of/ ); -} \ No newline at end of file +}