.gear-rules | 2 + .../43e86c8eb0638d5d4cad80ada9b699a31a145fd0 | 13 +++ .gear-tags/list | 1 + CSV_XS.pm | 8 +- Makefile.PL | 73 +---------------- perl-Text-CSV_XS.spec | 86 ++++++++++++++++++++ 6 files changed, 107 insertions(+), 76 deletions(-) diff --git a/.gear-rules b/.gear-rules new file mode 100644 index 0000000..7ce30a1 --- /dev/null +++ b/.gear-rules @@ -0,0 +1,2 @@ +tar: @version@:. name=Text-CSV_XS-@version@ +diff: @version@:. . name=perl-Text-CSV_XS-@version@-@release@.patch diff --git a/.gear-tags/43e86c8eb0638d5d4cad80ada9b699a31a145fd0 b/.gear-tags/43e86c8eb0638d5d4cad80ada9b699a31a145fd0 new file mode 100644 index 0000000..ba98170 --- /dev/null +++ b/.gear-tags/43e86c8eb0638d5d4cad80ada9b699a31a145fd0 @@ -0,0 +1,13 @@ +object ff5a3646c9e2efbc02e69d4aa594acf949f6fa87 +type commit +tag 0.68 +tagger Alexey Tourbin 1254985075 +0400 + +0.68 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.10 (GNU/Linux) + +iEYEABECAAYFAkrNjXMACgkQfBKgtDjnu0Z3EQCcDgCjLcq7IuNPwF1UyR+CLTDY +rY8AnjZ6f8cZh7mmd0N+aL7zSjt2cQZO +=SGjj +-----END PGP SIGNATURE----- diff --git a/.gear-tags/list b/.gear-tags/list new file mode 100644 index 0000000..57efcb6 --- /dev/null +++ b/.gear-tags/list @@ -0,0 +1 @@ +43e86c8eb0638d5d4cad80ada9b699a31a145fd0 0.68 diff --git a/CSV_XS.pm b/CSV_XS.pm index f1997a0..ebd4b03 100644 --- a/CSV_XS.pm +++ b/CSV_XS.pm @@ -26,13 +26,13 @@ require 5.005; use strict; use warnings; -use DynaLoader (); use Carp; -use vars qw( $VERSION @ISA ); +use vars qw( $VERSION ); $VERSION = "0.68"; -@ISA = qw( DynaLoader ); -bootstrap Text::CSV_XS $VERSION; + +require XSLoader; +XSLoader::load(__PACKAGE__, $VERSION); sub PV { 0 } sub IV { 1 } diff --git a/Makefile.PL b/Makefile.PL index ac22ff0..08e73ab 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -7,25 +7,12 @@ use strict; use ExtUtils::MakeMaker; -eval { require Text::CSV_XS }; -if (!$@ && $Text::CSV_XS::VERSION < 0.15) { - print <<'MSG'; - -You seem to have installed a previous version of the Text::CSV_XS module. -Note that you might encounter problems in existing applications (not the -DBD::CSV driver) due to incompatible changes in the print and getline -methods. See "perldoc CSV_XS.pm" for details. - -MSG - sleep 5; - } - my %wm = ( NAME => "Text::CSV_XS", ABSTRACT => "Comma-Separated Values manipulation routines", AUTHOR => "H.Merijn Brand ", VERSION_FROM => "CSV_XS.pm", - PREREQ_PM => { "DynaLoader" => 0, + PREREQ_PM => { "XSLoader" => 0, "Config" => 0, "IO::Handle" => 0, "Test::More" => 0, @@ -46,61 +33,3 @@ $ExtUtils::MakeMaker::VERSION > 6.30 and $wm{LICENSE} = "perl"; my $rv = WriteMakefile (%wm); 1; - -package MY; - -sub postamble -{ - my $valgrind = join " ", qw( - PERL_DESTRUCT_LEVEL=2 PERL_DL_NONLAZY=1 - valgrind - --suppressions=sandbox/perl.supp - --leak-check=yes - --leak-resolution=high - --show-reachable=yes - --num-callers=50 - --log-fd=3 - $(FULLPERLRUN) "-MExtUtils::Command::MM" "-e" - "test_harness($(TEST_VERBOSE), '$(INST_LIB)', '$(INST_ARCHLIB)')" - $(TEST_FILES) 3>valgrind.log - ); - - my $min_vsn = ($] >= 5.010 && -d "xt" && -d "tmp" && ($ENV{AUTOMATED_TESTING} || 0) != 1) - ? join "\n" => - 'test ::', - ' -@env TEST_FILES="xt/*.t" make -e test_dynamic', - '' - : ""; - join "\n" => - 'cover test_cover:', - ' ccache -C', - ' -@rm -f *.gc??', - ' cover -test', - '', - 'leakcheck:', - " $valgrind", - ' -@tail -5 valgrind.log', - '', - 'leaktest:', - q{ sandbox/leaktest $(FULLPERLRUN) "test_harness($(TEST_VERBOSE), '$(INST_LIB)', '$(INST_ARCHLIB)')" $(TEST_FILES)}, - '', - 'leaktrace:', - q{ sandbox/leaktrace $(FULLPERLRUN) "test_harness($(TEST_VERBOSE), '$(INST_LIB)', '$(INST_ARCHLIB)')" $(TEST_FILES)}, - '', - 'checkmeta:', - ' perl sandbox/genPPPort_h.pl', - ' perl sandbox/genMETA.pl -c', - '', - 'fixmeta: distmeta', - ' perl sandbox/genMETA.pl', - '', - 'tgzdist: checkmeta fixmeta $(DISTVNAME).tar.gz distcheck', - ' -@mv -f $(DISTVNAME).tar.gz $(DISTVNAME).tgz', - ' -@cpants_lint.pl $(DISTVNAME).tgz', - ' -@rm -f Debian_CPANTS.txt', - '', - 'test_speed: pure_all', - ' PERL_DL_NONLAZY=1 $(FULLPERLRUN) -I"$(INST_LIB)" -I"$(INST_ARCHLIB)" examples/speed.pl', - '', - $min_vsn; - } # postamble diff --git a/perl-Text-CSV_XS.spec b/perl-Text-CSV_XS.spec new file mode 100644 index 0000000..022db97 --- /dev/null +++ b/perl-Text-CSV_XS.spec @@ -0,0 +1,86 @@ +%define dist Text-CSV_XS +Name: perl-%dist +Version: 0.68 +Release: alt1 + +Summary: Comma-separated values manipulation routines +License: GPL or Artistic +Group: Development/Perl + +URL: %CPAN %dist +Source: %dist-%version.tar +Patch: %name-%version-%release.patch + +# Automatically added by buildreq on Thu Oct 08 2009 +BuildRequires: perl-Test-Pod + +%description +Text::CSV_XS provides facilities for the composition and decomposition of +comma-separated values. An instance of the Text::CSV_XS class can combine +fields into a CSV string and parse a CSV string into fields. + +%prep +%setup -q -n %dist-%version +%patch -p1 + +%build +%perl_vendor_build + +%install +%perl_vendor_install + +%files +%doc ChangeLog README +%perl_vendor_archlib/Text* +%perl_vendor_autolib/Text* + +%changelog +* Thu Oct 08 2009 Alexey Tourbin 0.68-alt1 +- 0.64 -> 0.68 + +* Tue Apr 07 2009 Alexey Tourbin 0.64-alt1 +- 0.60 -> 0.64 + +* Sat Mar 07 2009 Alexey Tourbin 0.60-alt1 +- 0.57 -> 0.60 + +* Mon Oct 27 2008 Alexey Tourbin 0.57-alt1 +- 0.54 -> 0.57 + +* Sun Sep 07 2008 Alexey Tourbin 0.54-alt1 +- 0.52 -> 0.54 + +* Tue Jul 15 2008 Alexey Tourbin 0.52-alt1 +- 0.50 -> 0.52 + +* Thu Jun 12 2008 Alexey Tourbin 0.50-alt1 +- 0.45 -> 0.50 + +* Thu Apr 24 2008 Alexey Tourbin 0.45-alt1 +- 0.41 -> 0.45 + +* Sat Apr 12 2008 Alexey Tourbin 0.41-alt1 +- 0.36 -> 0.41 + +* Fri Mar 07 2008 Alexey Tourbin 0.36-alt1 +- 0.31 -> 0.36 + +* Thu Jul 26 2007 Alexey Tourbin 0.31-alt1 +- 0.29 -> 0.31 + +* Fri Jun 08 2007 Alexey Tourbin 0.29-alt1 +- 0.23 -> 0.29 + +* Thu Apr 19 2007 Alexey Tourbin 0.23-alt2 +- cleanup + +* Sat Feb 19 2005 ALT QA Team Robot 0.23-alt1.1 +- Rebuilt with rpm-build-perl-0.5.1. + +* Tue Jul 08 2003 Michael Shigorin 0.23-alt1 +- alt1 +- spec file provided by Valentin Solomko + +* Thu May 15 2003 Valentyn Solomko 0.23-val1 +- built for ALT Linux +