diff --git a/.gitignore b/.gitignore index 4bfd19a..aaad7f6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /msgpack-1.3.0.tar.gz /msgpack-1.4.1.tar.gz /msgpack-1.4.2.tar.gz +/msgpack-3.0.1.tar.gz diff --git a/msgpack.spec b/msgpack.spec index 293fdd4..ef4f52a 100644 --- a/msgpack.spec +++ b/msgpack.spec @@ -1,6 +1,6 @@ Name: msgpack -Version: 1.4.2 -Release: 5%{?dist} +Version: 3.0.1 +Release: 1%{?dist} Summary: Binary-based efficient object serialization library Group: System Environment/Libraries @@ -8,8 +8,9 @@ License: Boost URL: http://msgpack.org Source0: https://github.com/msgpack/msgpack-c/releases/download/cpp-%{version}/%{name}-%{version}.tar.gz -# for regenerating configure -BuildRequires: libtool +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: doxygen # for %%check BuildRequires: gtest-devel BuildRequires: zlib-devel @@ -34,20 +35,31 @@ Libraries and header files for %{name} %build -sed -i 's/ -Werror / /g' configure.in -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} +%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 +rm -fv $RPM_BUILD_ROOT%{_libdir}/libmsgpackc.a %ldconfig_scriptlets @@ -62,9 +74,13 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f '{}' ';' %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/msgpack.pc +%{_libdir}/cmake/msgpack %changelog +* Thu Jun 7 2018 Daiki Ueno - 3.0.1-1 +- new upstream release + * Thu Feb 08 2018 Fedora Release Engineering - 1.4.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index c768540..870d4c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (msgpack-1.4.2.tar.gz) = c2da1d3bcc4e3dbcd93e005c63796e52e071d47ccd18434d4d3483b2e8255cf89ade746392decaa50e3911ca0134bb0da88b3b2ada9acfba0d331dfd48843548 +SHA512 (msgpack-3.0.1.tar.gz) = b1ddf135ba83cb4167edf638cc3dd0ea392136dc9ad52cd99fc9db4d0a26fb283105d585323facae55ce3c55a4870ae5e7a52194ea9535139e217f4febe11128