diff --git a/.gitignore b/.gitignore index f3162d8..f5a635d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /msgpack-0.5.8.tar.gz /msgpack-0.5.9.tar.gz /msgpack-1.3.0.tar.gz +/msgpack-1.4.1.tar.gz diff --git a/msgpack-1.3.0-arm-char.patch b/msgpack-1.3.0-arm-char.patch deleted file mode 100644 index f66f3c3..0000000 --- a/msgpack-1.3.0-arm-char.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: msgpack-1.3.0/include/msgpack/adaptor/int.hpp -=================================================================== ---- msgpack-1.3.0.orig/include/msgpack/adaptor/int.hpp -+++ msgpack-1.3.0/include/msgpack/adaptor/int.hpp -@@ -70,13 +70,17 @@ namespace detail { - template <> - struct object_char_sign { - static inline void make(msgpack::object& o, char v) { -- if (v < 0) { -+ // Since char is unsigned on ARM, the condition below -+ // always evaluates to true and causes error if -+ // -Werror=type-limits is enabled. -+ int v2 = v; -+ if (v2 < 0) { - o.type = msgpack::type::NEGATIVE_INTEGER; -- o.via.i64 = v; -+ o.via.i64 = v2; - } - else { - o.type = msgpack::type::POSITIVE_INTEGER; -- o.via.u64 = v; -+ o.via.u64 = v2; - } - } - }; diff --git a/msgpack.spec b/msgpack.spec index cdecfaa..4f005b7 100644 --- a/msgpack.spec +++ b/msgpack.spec @@ -1,6 +1,6 @@ Name: msgpack -Version: 1.3.0 -Release: 2%{?dist} +Version: 1.4.1 +Release: 1%{?dist} Summary: Binary-based efficient object serialization library Group: System Environment/Libraries @@ -8,8 +8,6 @@ License: Boost URL: http://msgpack.org Source0: https://github.com/msgpack/msgpack-c/releases/download/cpp-%{version}/%{name}-%{version}.tar.gz -Patch0: msgpack-1.3.0-arm-char.patch - # for regenerating configure BuildRequires: libtool # for %%check @@ -33,7 +31,6 @@ Libraries and header files for %{name} %prep %setup -q -%patch0 -p1 -b .arm-char %build @@ -69,6 +66,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f '{}' ';' %changelog +* Thu Apr 7 2016 Daiki Ueno - 1.4.1-1 +- new upstream release + * Thu Feb 04 2016 Fedora Release Engineering - 1.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 7df2c7b..5ae5e53 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -22f122176507f1bab479598f52f1b005 msgpack-1.3.0.tar.gz +fde8da1388d4f8daf21faee5536a53cf msgpack-1.4.1.tar.gz