From 61615a4db893f7476d5d830d797cdcf0a4534abd Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 8 Jul 2008 15:08:21 +0000 Subject: [PATCH] - Actually solving the issue mentioned in previous change --- perl-Text-CSV_XS-0.52-svupgrade.patch | 18 ++++++++++++++++++ perl-Text-CSV_XS.spec | 7 ++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 perl-Text-CSV_XS-0.52-svupgrade.patch diff --git a/perl-Text-CSV_XS-0.52-svupgrade.patch b/perl-Text-CSV_XS-0.52-svupgrade.patch new file mode 100644 index 0000000..f0564c6 --- /dev/null +++ b/perl-Text-CSV_XS-0.52-svupgrade.patch @@ -0,0 +1,18 @@ +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 42dc090..d8134ad 100644 --- a/perl-Text-CSV_XS.spec +++ b/perl-Text-CSV_XS.spec @@ -1,12 +1,13 @@ Name: perl-Text-CSV_XS Version: 0.52 -Release: 1%{?dist} +Release: 2%{?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) @@ -21,6 +22,7 @@ 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/* @@ -55,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jul 08 2008 Lubomir Rintel - 0.52-2 +- Actually solving the issue mentioned in previous change + * Tue Jul 08 2008 Lubomir Rintel - 0.52-1 - Updated to 0.52 to solve an issue with perl 5.10