diff --git a/cpprest.changes b/cpprest.changes index 41bc38f..242e1a4 100644 --- a/cpprest.changes +++ b/cpprest.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 5 08:15:39 UTC 2020 - Tomáš Chvátal + +- Update to 2.10.16: + * Various c++11 fixes + * Cmake buildsystem improvements + ------------------------------------------------------------------- Mon Aug 5 19:24:16 UTC 2019 - Antoine Belvire diff --git a/cpprest.spec b/cpprest.spec index 7220222..1d6ad72 100644 --- a/cpprest.spec +++ b/cpprest.spec @@ -1,7 +1,7 @@ # # spec file for package cpprest # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define major 2 %define minor 10 Name: cpprest -Version: 2.10.14 +Version: 2.10.16 Release: 0 Summary: C++ REST library # main: MIT (license.txt) @@ -29,12 +29,12 @@ Summary: C++ REST library # common/md5.hpp: Zlib (ThirdPartyNotices.txt) # utf8_validation.hpp: MIT (ThirdPartyNotices.txt) License: MIT AND BSD-3-Clause AND Zlib -Group: Development/Libraries/C and C++ URL: https://github.com/Microsoft/cpprestsdk Source: https://github.com/Microsoft/cpprestsdk/archive/v%{version}/cpprestsdk-%{version}.tar.gz BuildRequires: cmake >= 3.0 BuildRequires: gcc-c++ -BuildRequires: openssl-devel >= 1.0 +BuildRequires: pkgconfig +BuildRequires: pkgconfig(libssl) >= 1.0 BuildRequires: pkgconfig(websocketpp) >= 0.8 BuildRequires: pkgconfig(zlib) %if 0%{?suse_version} > 1325 @@ -57,7 +57,6 @@ Also known as Casablanca. %package -n libcpprest%{major}_%{minor} Summary: C++ Rest library -Group: System/Libraries %description -n libcpprest%{major}_%{minor} The C++ REST SDK is a Microsoft project for cloud-based client-server @@ -66,7 +65,6 @@ project aims to help C++ developers connect to and interact with services. %package devel Summary: Development files for %{name} -Group: Development/Libraries/C and C++ Requires: libcpprest%{major}_%{minor} = %{version} %description devel @@ -81,22 +79,12 @@ Development files. %build %cmake \ - -DCMAKE_BUILD_TYPE=Release \ -%ifarch ppc ppc64 ppc64le aarch64 %{arm} - -DCMAKE_CXX_FLAGS:STRING="%{optflags} -Wno-deprecated-copy -Wno-redundant-move -Wno-error=attributes -Wno-error=type-limits -Wno-error=cast-align -Wno-error=deprecated-declarations" \ -%else - -DCMAKE_CXX_FLAGS:STRING="%{optflags} -Wno-deprecated-copy -Wno-redundant-move" \ -%endif - ../Release -make %{?_smp_mflags} + -DCMAKE_BUILD_TYPE=Release \ + -DWERROR=OFF +%cmake_build %install -mkdir -p %{buildroot}%{_includedir} -cp -r Release/include/* %{buildroot}%{_includedir}/ -install -d -m 755 %{buildroot}%{_libdir} -chmod -x %{buildroot}%{_includedir}/cpprest/oauth1.h -cp build/Binaries/libcpprest.so.%{major}.%{minor} %{buildroot}%{_libdir}/ -ln -sf libcpprest.so.%{major}.%{minor} %{buildroot}%{_libdir}/libcpprest.so +%cmake_install # create a pkgconfig file install -d %{buildroot}%{_libdir}/pkgconfig @@ -114,6 +102,15 @@ Libs: -L%{_libdir} -lcpprest Cflags: -I%{_includedir}/cpprest -I%{_includedir}/pplx EOF +%check +# websocketsclient_test -> authentication_tests - online tests +# httpclient_test -> follows_retrieval_redirect - online test +# do not use macro so we can exclude tests +pushd build +export LD_LIBRARY_PATH=%{buildroot}%{_libdir} +ctest --output-on-failure --force-new-ctest-process %{_smp_mflags} -E '(httpclient_test|websocketsclient_test)' +popd + %post -n libcpprest%{major}_%{minor} -p /sbin/ldconfig %postun -n libcpprest%{major}_%{minor} -p /sbin/ldconfig @@ -129,6 +126,7 @@ EOF %{_includedir}/%{name} %{_includedir}/pplx %{_libdir}/libcpprest.so +%{_libdir}/cmake/* %{_libdir}/pkgconfig/%{name}.pc %changelog diff --git a/cpprestsdk-2.10.14.tar.gz b/cpprestsdk-2.10.14.tar.gz deleted file mode 100644 index f071052..0000000 --- a/cpprestsdk-2.10.14.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f2628b248f714d7bbd6a536553bc3782602c68ca1b129017985dd70cc3515278 -size 1762692 diff --git a/cpprestsdk-2.10.16.tar.gz b/cpprestsdk-2.10.16.tar.gz new file mode 100644 index 0000000..acd2f8f --- /dev/null +++ b/cpprestsdk-2.10.16.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d75e17c7d79131320438f2a15331f7ca6281c38c0e2daa27f051e290eeb8681 +size 1768423