From 9ac7feebdb030d9ac5c8bb1f469d6d1145241491 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 10 Dec 2008 15:11:51 +0000 Subject: [PATCH] - Update to latest upstream - SvUPGRADE patch upstreamed --- .cvsignore | 2 +- perl-Text-CSV_XS-0.52-svupgrade.patch | 18 ------------------ perl-Text-CSV_XS.spec | 10 ++++++---- sources | 2 +- 4 files changed, 8 insertions(+), 24 deletions(-) delete mode 100644 perl-Text-CSV_XS-0.52-svupgrade.patch diff --git a/.cvsignore b/.cvsignore index 12fe0e9..36c0eb0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Text-CSV_XS-0.52.tgz +Text-CSV_XS-0.58.tgz diff --git a/perl-Text-CSV_XS-0.52-svupgrade.patch b/perl-Text-CSV_XS-0.52-svupgrade.patch deleted file mode 100644 index f0564c6..0000000 --- a/perl-Text-CSV_XS-0.52-svupgrade.patch +++ /dev/null @@ -1,18 +0,0 @@ -Under some circumstances, newSVpv() returns SV of higher type than -SVt_PVIV, such as SVt_PVMG. - -Lubomir Rintel -Upstream: http://repo.or.cz/w/Text-CSV_XS.git?a=commit;h=72d4bab14e22e62699e90eeb306c606435ef31a6 - -diff -urp Text-CSV_XS-0.52.orig/CSV_XS.xs Text-CSV_XS-0.52/CSV_XS.xs ---- Text-CSV_XS-0.52.orig/CSV_XS.xs 2008-06-17 12:20:00.000000000 +0200 -+++ Text-CSV_XS-0.52/CSV_XS.xs 2008-07-08 14:42:33.000000000 +0200 -@@ -181,7 +181,7 @@ static SV *SetDiag (csv_t *csv, int xse) - - while (xs_errors[i].xs_errno && xs_errors[i].xs_errno != xse) i++; - if ((err = newSVpv (xs_errors[i].xs_errstr, 0))) { -- sv_upgrade (err, SVt_PVIV); -+ SvUPGRADE (err, SVt_PVIV); - SvIV_set (err, xse); - SvIOK_on (err); - hv_store (csv->self, "_ERROR_DIAG", 11, err, 0); diff --git a/perl-Text-CSV_XS.spec b/perl-Text-CSV_XS.spec index d8134ad..a282009 100644 --- a/perl-Text-CSV_XS.spec +++ b/perl-Text-CSV_XS.spec @@ -1,13 +1,12 @@ Name: perl-Text-CSV_XS -Version: 0.52 -Release: 2%{?dist} +Version: 0.58 +Release: 1%{?dist} Summary: Comma-separated values manipulation routines Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Text-CSV_XS/ Source0: http://www.cpan.org/authors/id/H/HM/HMBRAND/Text-CSV_XS-%{version}.tgz -Patch0: perl-Text-CSV_XS-0.52-svupgrade.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(Test::Pod) @@ -22,7 +21,6 @@ fields into a CSV string and parse a CSV string into fields. %prep %setup -q -n Text-CSV_XS-%{version} -%patch0 -p1 -b .svupgrade chmod -c a-x examples/* @@ -57,6 +55,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Dec 10 2008 Lubomir Rintel - 0.58-1 +- Update to latest upstream +- SvUPGRADE patch upstreamed + * Tue Jul 08 2008 Lubomir Rintel - 0.52-2 - Actually solving the issue mentioned in previous change diff --git a/sources b/sources index 8eccb45..76b806c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2cd7a3b74930cb92e579e5a890712361 Text-CSV_XS-0.52.tgz +0a60b6423f752220716dc0672b482055 Text-CSV_XS-0.58.tgz