From e3831c7ad59834d4779acc6ebc73872fb65ce354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 27 Apr 2016 15:17:32 +0200 Subject: [PATCH] 1.5 bump --- .gitignore | 1 + ...XS-1.5-Cast-char-and-U8-where-needed.patch | 18 ++++++++-------- perl-CBOR-XS.spec | 21 +++++++++++++------ sources | 2 +- 4 files changed, 26 insertions(+), 16 deletions(-) rename CBOR-XS-1.41-Cast-char-and-U8-where-needed.patch => CBOR-XS-1.5-Cast-char-and-U8-where-needed.patch (82%) diff --git a/.gitignore b/.gitignore index 497332a..d85aad1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /CBOR-XS-1.3.tar.gz /CBOR-XS-1.4.tar.gz /CBOR-XS-1.41.tar.gz +/CBOR-XS-1.5.tar.gz diff --git a/CBOR-XS-1.41-Cast-char-and-U8-where-needed.patch b/CBOR-XS-1.5-Cast-char-and-U8-where-needed.patch similarity index 82% rename from CBOR-XS-1.41-Cast-char-and-U8-where-needed.patch rename to CBOR-XS-1.5-Cast-char-and-U8-where-needed.patch index 463a5cd..10293b2 100644 --- a/CBOR-XS-1.41-Cast-char-and-U8-where-needed.patch +++ b/CBOR-XS-1.5-Cast-char-and-U8-where-needed.patch @@ -1,4 +1,4 @@ -From 8a46c1a9758a359755d2f33f641a264c6d3c69a0 Mon Sep 17 00:00:00 2001 +From 7808571acdea1c66705d5296c57eb7e0de8ed4c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 29 Sep 2015 10:31:58 +0200 Subject: [PATCH] Cast char* and U8* where needed @@ -15,10 +15,10 @@ Signed-off-by: Petr Písař 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/XS.xs b/XS.xs -index c46a5e7..56223bd 100644 +index 25e2b9e..2aa6c57 100644 --- a/XS.xs +++ b/XS.xs -@@ -770,7 +770,7 @@ decode_he (dec_t *dec, HV *hv) +@@ -802,7 +802,7 @@ decode_he (dec_t *dec, HV *hv) dec->cur += len; if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) @@ -27,7 +27,7 @@ index c46a5e7..56223bd 100644 ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); hv_store (hv, key, -len, decode_sv (dec), 0); -@@ -859,7 +859,7 @@ decode_str (dec_t *dec, int utf8) +@@ -891,7 +891,7 @@ decode_str (dec_t *dec, int utf8) STRLEN len = decode_uint (dec); WANT (len); @@ -36,7 +36,7 @@ index c46a5e7..56223bd 100644 dec->cur += len; } } -@@ -868,7 +868,7 @@ decode_str (dec_t *dec, int utf8) +@@ -900,7 +900,7 @@ decode_str (dec_t *dec, int utf8) STRLEN len = decode_uint (dec); WANT (len); @@ -45,7 +45,7 @@ index c46a5e7..56223bd 100644 dec->cur += len; if (ecb_expect_false (dec->stringref) -@@ -879,7 +879,7 @@ decode_str (dec_t *dec, int utf8) +@@ -911,7 +911,7 @@ decode_str (dec_t *dec, int utf8) if (utf8) { if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) @@ -54,7 +54,7 @@ index c46a5e7..56223bd 100644 ERR ("corrupted CBOR data (invalid UTF-8 in text string)"); SvUTF8_on (sv); -@@ -1189,7 +1189,7 @@ decode_cbor (SV *string, CBOR *cbor, char **offset_return) +@@ -1221,7 +1221,7 @@ decode_cbor (SV *string, CBOR *cbor, char **offset_return) sv = decode_sv (&dec); if (offset_return) @@ -63,7 +63,7 @@ index c46a5e7..56223bd 100644 if (!(offset_return || !sv)) if (dec.cur != dec.end && !dec.err) -@@ -1239,7 +1239,7 @@ incr_parse (CBOR *self, SV *cborstr) +@@ -1271,7 +1271,7 @@ incr_parse (CBOR *self, SV *cborstr) 1, 2, 4, 8,-1,-1,-1,-2 }; @@ -73,5 +73,5 @@ index c46a5e7..56223bd 100644 IV count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]); I8 ilen = incr_len[m]; -- -2.5.0 +2.5.5 diff --git a/perl-CBOR-XS.spec b/perl-CBOR-XS.spec index 9115d81..29e60bd 100644 --- a/perl-CBOR-XS.spec +++ b/perl-CBOR-XS.spec @@ -1,4 +1,4 @@ -%global cpan_version 1.41 +%global cpan_version 1.5 Name: perl-CBOR-XS Version: %(echo %{cpan_version} | sed 's/\(\..\)\(.\)/\1.\2/') Release: 1%{?dist} @@ -13,7 +13,7 @@ Source0: http://www.cpan.org/authors/id/M/ML/MLEHMANN/CBOR-XS-%{cpan_vers # Use system libecb Patch0: CBOR-XS-1.3-Include-ecb.h-from-system.patch # Silent compiler warnings -Patch1: CBOR-XS-1.41-Cast-char-and-U8-where-needed.patch +Patch1: CBOR-XS-1.5-Cast-char-and-U8-where-needed.patch BuildRequires: coreutils BuildRequires: findutils # gcc for standard header files @@ -21,22 +21,28 @@ BuildRequires: gcc BuildRequires: libecb-static BuildRequires: make BuildRequires: perl -BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl-devel +BuildRequires: perl-generators +BuildRequires: perl(Canary::Stability) +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.52 BuildRequires: sed # Run-time: BuildRequires: perl(common::sense) BuildRequires: perl(Exporter) BuildRequires: perl(Math::BigFloat) BuildRequires: perl(Math::BigInt) +BuildRequires: perl(Math::BigRat) BuildRequires: perl(Time::Piece) BuildRequires: perl(Types::Serialiser) BuildRequires: perl(URI) BuildRequires: perl(XSLoader) # Tests: BuildRequires: perl(Data::Dumper) +BuildRequires: perl(Math::BigInt::FastCalc) Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(Math::BigFloat) Requires: perl(Math::BigInt) +Requires: perl(Math::BigRat) Requires: perl(Time::Piece) Requires: perl(URI) @@ -56,13 +62,13 @@ rm ecb.h sed -i -e '/^ecb\.h/d' MANIFEST %build -perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" - 1.5-1 +- 1.5 bump + * Mon Feb 29 2016 Petr Pisar - 1.4.1-1 - 1.41 bump diff --git a/sources b/sources index d1bed03..fd13701 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b76eee24f9bb8adc766b2867f18fe493 CBOR-XS-1.41.tar.gz +5e50ffe54bff32508846acf1d9a139eb CBOR-XS-1.5.tar.gz