automatic import of msgpackepel7

4 files changed, 121 insertions, 18 deletions

diff --git a/.gitignore b/.gitignore
index 13dbe8d..0f17d40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /msgpack-1.4.1.tar.gz
+/msgpack-3.1.0.tar.gz
diff --git a/0001-Fixed-724.patch b/0001-Fixed-724.patch
new file mode 100644
index 0000000..16bebe1
--- /dev/null
+++ b/0001-Fixed-724.patch
@@ -0,0 +1,61 @@
+From 53d2ea9ad3cc20e1beac2e1c014082c25e221182 Mon Sep 17 00:00:00 2001
+From: Takatoshi Kondo <redboltz@gmail.com>
+Date: Sun, 26 Aug 2018 10:58:47 +0900
+Subject: [PATCH] Fixed #724.
+
+Fixed type mismatch in msgpack_timestamp.
+Added 64bit singed postfix.
+---
+ include/msgpack/timestamp.h                 | 8 ++++++--
+ include/msgpack/v1/adaptor/cpp11/chrono.hpp | 4 ++--
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/include/msgpack/timestamp.h b/include/msgpack/timestamp.h
+index 4d7df83d..76139312 100644
+--- a/include/msgpack/timestamp.h
++++ b/include/msgpack/timestamp.h
+@@ -28,13 +28,17 @@ static inline bool msgpack_object_to_timestamp(const msgpack_object* obj, msgpac
+     switch (obj->via.ext.size) {
+     case 4:
+         ts->tv_nsec = 0;
+-        _msgpack_load32(uint32_t, obj->via.ext.ptr, &ts->tv_sec);
++        {
++            uint32_t v;
++            _msgpack_load32(uint32_t, obj->via.ext.ptr, &v);
++            ts->tv_sec = v;
++        }
+         return true;
+     case 8: {
+         uint64_t value;
+         _msgpack_load64(uint64_t, obj->via.ext.ptr, &value);
+         ts->tv_nsec = (uint32_t)(value >> 34);
+-        ts->tv_sec = value & 0x00000003ffffffffL;
++        ts->tv_sec = value & 0x00000003ffffffffLL;
+         return true;
+     }
+     case 12:
+diff --git a/include/msgpack/v1/adaptor/cpp11/chrono.hpp b/include/msgpack/v1/adaptor/cpp11/chrono.hpp
+index 1e08355e..db2035b7 100644
+--- a/include/msgpack/v1/adaptor/cpp11/chrono.hpp
++++ b/include/msgpack/v1/adaptor/cpp11/chrono.hpp
+@@ -41,7 +41,7 @@ struct as<std::chrono::system_clock::time_point> {
+             uint64_t value;
+             _msgpack_load64(uint64_t, o.via.ext.data(), &value);
+             uint32_t nanosec = static_cast<uint32_t>(value >> 34);
+-            uint64_t sec = value & 0x00000003ffffffffL;
++            uint64_t sec = value & 0x00000003ffffffffLL;
+             tp += std::chrono::duration_cast<std::chrono::system_clock::duration>(
+                 std::chrono::nanoseconds(nanosec));
+             tp += std::chrono::seconds(sec);
+@@ -79,7 +79,7 @@ struct convert<std::chrono::system_clock::time_point> {
+             uint64_t value;
+             _msgpack_load64(uint64_t, o.via.ext.data(), &value);
+             uint32_t nanosec = static_cast<uint32_t>(value >> 34);
+-            uint64_t sec = value & 0x00000003ffffffffL;
++            uint64_t sec = value & 0x00000003ffffffffLL;
+             tp += std::chrono::duration_cast<std::chrono::system_clock::duration>(
+                 std::chrono::nanoseconds(nanosec));
+             tp += std::chrono::seconds(sec);
+-- 
+2.17.1
+
diff --git a/msgpack.spec b/msgpack.spec
index 4f005b7..ba84d23 100644
--- a/msgpack.spec
+++ b/msgpack.spec
@@ -1,15 +1,16 @@
 Name:		msgpack
-Version:	1.4.1
-Release:	1%{?dist}
+Version:	3.1.0
+Release:	2%{?dist}
 Summary:	Binary-based efficient object serialization library
-Group:		System Environment/Libraries
 
 License:	Boost
 URL:		http://msgpack.org
 Source0:	https://github.com/msgpack/msgpack-c/releases/download/cpp-%{version}/%{name}-%{version}.tar.gz
+Patch:		0001-Fixed-724.patch
 
-# for regenerating configure
-BuildRequires:	libtool
+BuildRequires:  cmake
+BuildRequires:  gcc-c++
+BuildRequires:  doxygen
 # for %%check
 BuildRequires:	gtest-devel
 BuildRequires:	zlib-devel
@@ -22,7 +23,6 @@ languages like JSON. But unlike JSON, it is very fast and small.
 
 %package devel
 Summary:	Libraries and header files for %{name}
-Group:		Development/Libraries
 Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %description devel
@@ -30,27 +30,35 @@ Libraries and header files for %{name}
 
 
 %prep
-%setup -q
+%autosetup -p1
 
 
 %build
-autoreconf -f -i
-%configure --disable-static
-make %{?_smp_mflags}
+if test ! -e "obj"; then
+  mkdir obj
+fi
+pushd obj
 
+%cmake .. -DCMAKE_INSTALL_LIBDIR=%{_libdir} -Dlibdir=%{_libdir} -DBUILD_SHARED_LIBS=ON
+%make_build
+
+popd
 
 %check
-make check
+pushd obj
+# https://github.com/msgpack/msgpack-c/issues/697
+export GTEST_FILTER=-object_with_zone.ext_empty
+make test || {
+    cat Testing/Temporary/LastTest.log;
+    exit 1;
+}
+popd
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f '{}' ';'
-
+make install/fast DESTDIR=$RPM_BUILD_ROOT -C obj
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 
 %files
@@ -63,9 +71,42 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f '{}' ';'
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/msgpack.pc
+%{_libdir}/cmake/msgpack
 
 
 %changelog
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Aug 22 2018 Daiki Ueno <dueno@redhat.com> - 3.1.0-1
+- new upstream release
+- cmake configuration files no longer rely on nonexistent static libraries
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Jun  7 2018 Daiki Ueno <dueno@redhat.com> - 3.0.1-1
+- new upstream release
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sat Feb 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.4.2-4
+- Switch to %%ldconfig_scriptlets
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Feb 21 2017 Daiki Ueno <dueno@redhat.com> - 1.4.2-1
+- new upstream release
+- avoid FTBFS with GCC7
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Thu Apr  7 2016 Daiki Ueno <dueno@redhat.com> - 1.4.1-1
 - new upstream release
 
diff --git a/sources b/sources
index 5ae5e53..990b574 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fde8da1388d4f8daf21faee5536a53cf  msgpack-1.4.1.tar.gz
+57bdba5ae83831c7c04aad39e479b225  msgpack-3.1.0.tar.gz