From 70bd8e35f3421272555108c5823c23782916969f Mon Sep 17 00:00:00 2001
From: Wolfgang Stöggl <c72578@yahoo.de>
Date: Aug 18 2018 02:01:07 +0000
Subject: New cpprest upstream version v2.10.5


---

diff --git a/.gitignore b/.gitignore
index be33545..76adfdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /cpprest-2.10.1.tar.gz
 /cpprest-2.10.2.tar.gz
 /cpprest-2.10.3.tar.gz
+/cpprest-2.10.5.tar.gz
diff --git a/cpprest-2.10.2-fix-libdir.patch b/cpprest-2.10.2-fix-libdir.patch
deleted file mode 100644
index e4c60e4..0000000
--- a/cpprest-2.10.2-fix-libdir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/Release/CMakeLists.txt b/Release/CMakeLists.txt
-index 3e0871c9..6a505ec3 100644
---- a/Release/CMakeLists.txt
-+++ b/Release/CMakeLists.txt
-@@ -18,7 +18,7 @@ enable_testing()
- set(WERROR ON CACHE BOOL "Treat Warnings as Errors.")
- set(CPPREST_EXCLUDE_WEBSOCKETS OFF CACHE BOOL "Exclude websockets functionality.")
- set(CPPREST_EXCLUDE_COMPRESSION OFF CACHE BOOL "Exclude compression functionality.")
--set(CPPREST_EXPORT_DIR lib/cpprestsdk CACHE STRING "Directory to install CMake config files.")
-+set(CPPREST_EXPORT_DIR lib${LIB_SUFFIX}/cmake/cpprestsdk CACHE STRING "Directory to install CMake config files.")
- set(CPPREST_INSTALL_HEADERS ON CACHE BOOL "Install header files.")
- set(CPPREST_INSTALL ON CACHE BOOL "Add install commands.")
- 
-diff --git a/Release/src/CMakeLists.txt b/Release/src/CMakeLists.txt
-index a37a8cff..cd90796a 100644
---- a/Release/src/CMakeLists.txt
-+++ b/Release/src/CMakeLists.txt
-@@ -251,8 +251,8 @@ if(CPPREST_INSTALL)
-     TARGETS ${CPPREST_TARGETS}
-     EXPORT cpprestsdk-targets
-     RUNTIME DESTINATION bin
--    LIBRARY DESTINATION lib
--    ARCHIVE DESTINATION lib
-+    LIBRARY DESTINATION lib${LIB_SUFFIX}
-+    ARCHIVE DESTINATION lib${LIB_SUFFIX}
-   )
- 
-   configure_file(../cmake/cpprestsdk-config.in.cmake "${CMAKE_CURRENT_BINARY_DIR}/cpprestsdk-config.cmake" @ONLY)
diff --git a/cpprest.spec b/cpprest.spec
index b40dfd1..af6f6d8 100644
--- a/cpprest.spec
+++ b/cpprest.spec
@@ -1,7 +1,7 @@
 %define major 2
 %define minor 10
 Name:           cpprest
-Version:        2.10.3
+Version:        2.10.5
 Release:        1%{?dist}
 Summary:        C++ REST library
 License:        MIT
@@ -13,9 +13,6 @@ Patch1:         cpprest-2.10.2-disable-outside-and-failing-tests.patch
 Patch2:         cpprest-2.10.0-disable-tests-long-timeouts.patch
 # Disable test extract_floating_point, which fails on ppc64le and aarch64
 Patch3:         cpprest-2.9.1-disable-test-extract_floating_point.patch
-# Fix libdir in cmake files
-# https://bugzilla.redhat.com/show_bug.cgi?id=1589284
-Patch4:         cpprest-2.10.2-fix-libdir.patch
 
 BuildRequires:  boost-devel >= 1.55
 BuildRequires:  cmake >= 3.0
@@ -56,7 +53,7 @@ cd Release
 mkdir build.release
 cd build.release
 export CXXFLAGS="%{optflags} -Wl,--as-needed"
-%cmake .. -DCMAKE_BUILD_TYPE=Release -DWERROR=OFF
+%cmake .. -DCMAKE_BUILD_TYPE=Release -DWERROR=OFF -DCPPREST_EXPORT_DIR=%{_lib}/cmake/cpprestsdk
 make %{?_smp_mflags}
 
 %install
@@ -90,6 +87,11 @@ cd Release/build.release/Binaries
 
 
 %changelog
+* Sat Aug 18 2018 Wolfgang Stöggl <c72578@yahoo.de> - 2.10.5-1
+- New upstream version
+- Remove cpprest-2.10.2-fix-libdir.patch
+- Use -DCPPREST_EXPORT_DIR to install cmake files in correct path
+
 * Sat Aug 04 2018 Wolfgang Stöggl <c72578@yahoo.de> - 2.10.3-1
 - New upstream version
 
diff --git a/sources b/sources
index a94d85f..3981afa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cpprest-2.10.3.tar.gz) = 0003d1230f7f26424b71f705fd95c3907b60ac0d574ef6199081a8edd385d1469f405cf973c074fe6a4fc71f585e5e42862940d285ba575075dec4cb27774c36
+SHA512 (cpprest-2.10.5.tar.gz) = 7942185e0e1cd5080b57737887f44c12e706cfb6428e55762dcbad2fd2c557f25bd26abe25b6abd9769ab6c0cea564541e7e95dcaff53e609124dda065fa41be