From 8912b3731ca9749848a06e5f3552e26a11478e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 30 Nov 2015 11:26:01 +0100 Subject: [PATCH] 3.008 bump --- .gitignore | 1 + ...ntheses-to-SRL_ENC_HAVE_OPTION-argum.patch | 41 ------------------- perl-Sereal-Encoder.spec | 8 ++-- sources | 2 +- 4 files changed, 6 insertions(+), 46 deletions(-) delete mode 100644 Sereal-3.007-Add-missing-parentheses-to-SRL_ENC_HAVE_OPTION-argum.patch diff --git a/.gitignore b/.gitignore index 05c4105..fd6fc8d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /Sereal-Encoder-3.005.tar.gz /Sereal-Encoder-3.006.tar.gz /Sereal-Encoder-3.007.tar.gz +/Sereal-Encoder-3.008.tar.gz diff --git a/Sereal-3.007-Add-missing-parentheses-to-SRL_ENC_HAVE_OPTION-argum.patch b/Sereal-3.007-Add-missing-parentheses-to-SRL_ENC_HAVE_OPTION-argum.patch deleted file mode 100644 index 435adc3..0000000 --- a/Sereal-3.007-Add-missing-parentheses-to-SRL_ENC_HAVE_OPTION-argum.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 38b829d8845fc795d9404cd0e24b21c5b06f0a6e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Fri, 27 Nov 2015 11:17:25 +0100 -Subject: [PATCH] Add missing parentheses to SRL_ENC_HAVE_OPTION arguments -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -GCC warns about missing parentheses: - -In file included from srl_encoder.c:50:0: -srl_encoder.c: In function ‘srl_dump_hv’: -srl_encoder.h:141:58: warning: suggest parentheses around arithmetic in operand of ‘|’ [-Wparentheses] - #define SRL_ENC_HAVE_OPTION(enc, flag_num) ((enc)->flags & flag_num) - ^ -srl_encoder.c:1431:18: note: in expansion of macro ‘SRL_ENC_HAVE_OPTION’ - if ( SRL_ENC_HAVE_OPTION(enc, SRL_F_SORT_KEYS|SRL_F_SORT_KEYS_PERL) ) { - -And indeed this is a bug. - -Signed-off-by: Petr Písař ---- - Perl/Encoder/srl_encoder.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Perl/Encoder/srl_encoder.h b/Perl/Encoder/srl_encoder.h -index 12ca951..639f220 100644 ---- a/Perl/Encoder/srl_encoder.h -+++ b/Perl/Encoder/srl_encoder.h -@@ -140,7 +140,7 @@ SV *srl_dump_data_structure_mortal_sv(pTHX_ srl_encoder_t *enc, SV *src, SV *use - /* Set while the encoder is in active use / dirty */ - #define SRL_OF_ENCODER_DIRTY 1UL - --#define SRL_ENC_HAVE_OPTION(enc, flag_num) ((enc)->flags & flag_num) -+#define SRL_ENC_HAVE_OPTION(enc, flag_num) ((enc)->flags & (flag_num)) - #define SRL_ENC_SET_OPTION(enc, flag_num) STMT_START {(enc)->flags |= (flag_num);}STMT_END - #define SRL_ENC_RESET_OPTION(enc, flag_num) STMT_START {(enc)->flags &= ~(flag_num);}STMT_END - --- -2.4.3 - diff --git a/perl-Sereal-Encoder.spec b/perl-Sereal-Encoder.spec index 7ff4636..17eda7d 100644 --- a/perl-Sereal-Encoder.spec +++ b/perl-Sereal-Encoder.spec @@ -1,5 +1,5 @@ Name: perl-Sereal-Encoder -Version: 3.007 +Version: 3.008 Release: 1%{?dist} Summary: Perl serialization into Serial format # lib/Sereal/Encoder.pm: GPL+ or Artistic @@ -11,8 +11,6 @@ License: (GPL+ or Artistic) and LGPLv2+ Group: Development/Libraries URL: http://search.cpan.org/dist/Sereal-Encoder/ Source0: http://www.cpan.org/authors/id/Y/YV/YVES/Sereal-Encoder-%{version}.tar.gz -# Fix a semantic bug, -Patch0: Sereal-3.007-Add-missing-parentheses-to-SRL_ENC_HAVE_OPTION-argum.patch BuildRequires: csnappy-devel BuildRequires: gcc BuildRequires: miniz-devel @@ -66,7 +64,6 @@ serializer using a binary protocol called Sereal. %prep %setup -q -n Sereal-Encoder-%{version} -%patch0 -p3 # Remove bundled Perl modules rm -r ./inc/Devel sed -i -s '/^inc\/Devel/d' MANIFEST @@ -97,6 +94,9 @@ make test %{_mandir}/man3/* %changelog +* Mon Nov 30 2015 Petr Pisar - 3.008-1 +- 3.008 bump + * Fri Nov 27 2015 Petr Pisar - 3.007-1 - 3.007 bump - License changed to ((GPL+ or Artistic) and LGPLv2+) diff --git a/sources b/sources index b0c4156..d438f70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a3e37d90d114f1afb49a6538f41cd988 Sereal-Encoder-3.007.tar.gz +66ef81463ff1f40efdd654bdeae3ffc9 Sereal-Encoder-3.008.tar.gz