diff --git a/.gitignore b/.gitignore index d85aad1..b6f92a5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /CBOR-XS-1.4.tar.gz /CBOR-XS-1.41.tar.gz /CBOR-XS-1.5.tar.gz +/CBOR-XS-1.6.tar.gz diff --git a/CBOR-XS-1.3-Include-ecb.h-from-system.patch b/CBOR-XS-1.6-Include-ecb.h-from-system.patch similarity index 73% rename from CBOR-XS-1.3-Include-ecb.h-from-system.patch rename to CBOR-XS-1.6-Include-ecb.h-from-system.patch index fc62033..754374d 100644 --- a/CBOR-XS-1.3-Include-ecb.h-from-system.patch +++ b/CBOR-XS-1.6-Include-ecb.h-from-system.patch @@ -1,6 +1,6 @@ -From 5f37da992f0c9ded881d22e607d77d89c57741a3 Mon Sep 17 00:00:00 2001 +From dfd64ddb0c6c14ed01665ed2317c86d66d08362c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Tue, 29 Sep 2015 10:13:05 +0200 +Date: Thu, 8 Dec 2016 09:41:45 +0100 Subject: [PATCH] Include ecb.h from system MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -12,11 +12,11 @@ Signed-off-by: Petr Písař 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XS.xs b/XS.xs -index 15bce1f..0af7c95 100644 +index 2dc62d2..704a3ad 100644 --- a/XS.xs +++ b/XS.xs -@@ -10,7 +10,7 @@ - #include +@@ -11,7 +11,7 @@ + #include #define ECB_NO_THREADS 1 -#include "ecb.h" @@ -25,5 +25,5 @@ index 15bce1f..0af7c95 100644 // compatibility with perl <5.18 #ifndef HvNAMELEN_get -- -2.4.3 +2.7.4 diff --git a/perl-CBOR-XS.spec b/perl-CBOR-XS.spec index e411830..dc2a5bf 100644 --- a/perl-CBOR-XS.spec +++ b/perl-CBOR-XS.spec @@ -1,7 +1,7 @@ -%global cpan_version 1.5 +%global cpan_version 1.6 Name: perl-CBOR-XS Version: %(echo %{cpan_version} | sed 's/\(\..\)\(.\)/\1.\2/') -Release: 2%{?dist} +Release: 1%{?dist} Summary: Concise Binary Object Representation (CBOR) # COPYING: GPLv3+ ## Replaced by system header-only package @@ -11,7 +11,7 @@ Group: Development/Libraries URL: http://search.cpan.org/dist/CBOR-XS/ Source0: http://www.cpan.org/authors/id/M/ML/MLEHMANN/CBOR-XS-%{cpan_version}.tar.gz # Use system libecb -Patch0: CBOR-XS-1.3-Include-ecb.h-from-system.patch +Patch0: CBOR-XS-1.6-Include-ecb.h-from-system.patch # Silent compiler warnings Patch1: CBOR-XS-1.5-Cast-char-and-U8-where-needed.patch BuildRequires: coreutils @@ -82,6 +82,9 @@ make test %{_mandir}/man3/* %changelog +* Thu Dec 08 2016 Petr Pisar - 1.6-1 +- 1.6 bump + * Sun May 15 2016 Jitka Plesnikova - 1.5-2 - Perl 5.24 rebuild diff --git a/sources b/sources index fd13701..0a955a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5e50ffe54bff32508846acf1d9a139eb CBOR-XS-1.5.tar.gz +12b34d40d1cec32dec1368d620075530 CBOR-XS-1.6.tar.gz