diff --git a/.gitignore b/.gitignore index cd636cb..1aef69e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /CBOR-XS-1.3.tar.gz +/CBOR-XS-1.4.tar.gz diff --git a/.rpmlint b/.rpmlint new file mode 100644 index 0000000..7c16114 --- /dev/null +++ b/.rpmlint @@ -0,0 +1,2 @@ +from Config import * +addFilter("spelling-error .* (versa|superset)"); diff --git a/CBOR-XS-1.3-Cast-char-and-U8-where-needed.patch b/CBOR-XS-1.4-Cast-char-and-U8-where-needed.patch similarity index 82% rename from CBOR-XS-1.3-Cast-char-and-U8-where-needed.patch rename to CBOR-XS-1.4-Cast-char-and-U8-where-needed.patch index 6601267..5be587f 100644 --- a/CBOR-XS-1.3-Cast-char-and-U8-where-needed.patch +++ b/CBOR-XS-1.4-Cast-char-and-U8-where-needed.patch @@ -1,4 +1,4 @@ -From fb089d08ff9bc5cf45570b950aa33e50ee62371b Mon Sep 17 00:00:00 2001 +From cb69e201f5e1107e6aa75799b29cf52a91b94922 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 0af7c95..134ed9e 100644 +index ab487f9..e413936 100644 --- a/XS.xs +++ b/XS.xs -@@ -765,7 +765,7 @@ decode_he (dec_t *dec, HV *hv) +@@ -767,7 +767,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 0af7c95..134ed9e 100644 ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); hv_store (hv, key, -len, decode_sv (dec), 0); -@@ -854,7 +854,7 @@ decode_str (dec_t *dec, int utf8) +@@ -856,7 +856,7 @@ decode_str (dec_t *dec, int utf8) STRLEN len = decode_uint (dec); WANT (len); @@ -36,7 +36,7 @@ index 0af7c95..134ed9e 100644 dec->cur += len; } } -@@ -863,7 +863,7 @@ decode_str (dec_t *dec, int utf8) +@@ -865,7 +865,7 @@ decode_str (dec_t *dec, int utf8) STRLEN len = decode_uint (dec); WANT (len); @@ -45,7 +45,7 @@ index 0af7c95..134ed9e 100644 dec->cur += len; if (ecb_expect_false (dec->stringref) -@@ -874,7 +874,7 @@ decode_str (dec_t *dec, int utf8) +@@ -876,7 +876,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 0af7c95..134ed9e 100644 ERR ("corrupted CBOR data (invalid UTF-8 in text string)"); SvUTF8_on (sv); -@@ -1181,7 +1181,7 @@ decode_cbor (SV *string, CBOR *cbor, char **offset_return) +@@ -1183,7 +1183,7 @@ decode_cbor (SV *string, CBOR *cbor, char **offset_return) sv = decode_sv (&dec); if (offset_return) @@ -63,7 +63,7 @@ index 0af7c95..134ed9e 100644 if (!(offset_return || !sv)) if (dec.cur != dec.end && !dec.err) -@@ -1231,7 +1231,7 @@ incr_parse (CBOR *self, SV *cborstr) +@@ -1233,7 +1233,7 @@ incr_parse (CBOR *self, SV *cborstr) 1, 2, 4, 8,-1,-1,-1,-2 }; @@ -73,5 +73,5 @@ index 0af7c95..134ed9e 100644 IV count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]); I8 ilen = incr_len[m]; -- -2.4.3 +2.5.0 diff --git a/perl-CBOR-XS.spec b/perl-CBOR-XS.spec index ef5fae5..5aeb8a9 100644 --- a/perl-CBOR-XS.spec +++ b/perl-CBOR-XS.spec @@ -1,6 +1,6 @@ Name: perl-CBOR-XS -Version: 1.3 -Release: 2%{?dist} +Version: 1.4 +Release: 1%{?dist} Summary: Concise Binary Object Representation (CBOR) # COPYING: GPLv3+ ## Replaced by system header-only package @@ -12,7 +12,7 @@ Source0: http://www.cpan.org/authors/id/M/ML/MLEHMANN/CBOR-XS-%{version}. # Use system libecb Patch0: CBOR-XS-1.3-Include-ecb.h-from-system.patch # Silent compiler warnings -Patch1: CBOR-XS-1.3-Cast-char-and-U8-where-needed.patch +Patch1: CBOR-XS-1.4-Cast-char-and-U8-where-needed.patch BuildRequires: coreutils BuildRequires: findutils # gcc for standard header files @@ -41,7 +41,7 @@ Requires: perl(URI) %description This module converts Perl data structures to the Concise Binary Object -Representation (CBOR) and vice versa. CBOR is a fast binary serialisation +Representation (CBOR) and vice versa. CBOR is a fast binary serialization format that aims to use an (almost) superset of the JSON data model, i.e. when you can represent something useful in JSON, you should be able to represent it in CBOR. @@ -75,6 +75,9 @@ make test %{_mandir}/man3/* %changelog +* Tue Feb 09 2016 Petr Pisar - 1.4-1 +- 1.4 bump + * Thu Feb 04 2016 Fedora Release Engineering - 1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 55774d7..8895ab0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5bfeba032f5fdbf45ef7275ddb37af97 CBOR-XS-1.3.tar.gz +624bd6819d34067eab6ffc8df0fb789f CBOR-XS-1.4.tar.gz