diff --git a/aces_fix-cmake-modules-path.patch b/aces_fix-cmake-modules-path.patch index 3c8fe1d..951597c 100644 --- a/aces_fix-cmake-modules-path.patch +++ b/aces_fix-cmake-modules-path.patch @@ -1,13 +1,9 @@ -From: Christophe Giboudeaux -Subject: Fix cmake modules path in CMakeLists.txt -Date: Wed Apr 3 11:20:27 UTC 2019 - -diff -Nru aws-c-event-stream-0.1.1.orig/CMakeLists.txt aws-c-event-stream-0.1.1/CMakeLists.txt ---- aws-c-event-stream-0.1.1.orig/CMakeLists.txt 2019-01-05 02:14:32.000000000 +0100 -+++ aws-c-event-stream-0.1.1/CMakeLists.txt 2019-04-09 12:52:27.628740293 +0200 -@@ -13,13 +13,11 @@ - cmake_minimum_required (VERSION 3.1) - project (aws-c-event-stream C) +diff -Nru aws-c-event-stream-0.1.3.orig/CMakeLists.txt aws-c-event-stream-0.1.3/CMakeLists.txt +--- aws-c-event-stream-0.1.3.orig/CMakeLists.txt 2019-09-14 02:52:46.000000000 +0200 ++++ aws-c-event-stream-0.1.3/CMakeLists.txt 2019-10-03 12:24:34.861135419 +0200 +@@ -21,17 +21,11 @@ + file(TO_CMAKE_PATH "${CMAKE_INSTALL_PREFIX}" CMAKE_INSTALL_PREFIX) + endif() -if (UNIX AND NOT APPLE) - include(GNUInstallDirs) @@ -18,31 +14,25 @@ diff -Nru aws-c-event-stream-0.1.1.orig/CMakeLists.txt aws-c-event-stream-0.1.1/ +find_package(aws-checksums REQUIRED) +set(CMAKE_MODULE_PATH ${aws-c-common_DIR}) --list(APPEND CMAKE_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake") +-# This is required in order to append /lib/cmake to each element in CMAKE_PREFIX_PATH +-set(AWS_MODULE_DIR "/${CMAKE_INSTALL_LIBDIR}/cmake") +-string(REPLACE ";" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${AWS_MODULE_DIR}") +-# Append that generated list to the module search path +-list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH}) +include(GNUInstallDirs) include(AwsCFlags) include(AwsSharedLibSetup) -@@ -71,9 +69,6 @@ - set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES VERSION 1.0.0) - set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES SOVERSION 0unstable) - --find_package(aws-c-common REQUIRED) --find_package(aws-checksums REQUIRED) -- - target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC AWS::aws-c-common AWS::aws-checksums) - - aws_prepare_shared_lib_exports(${CMAKE_PROJECT_NAME}) -@@ -83,7 +78,7 @@ - COMPONENT Development) +@@ -101,7 +95,7 @@ + endif() install(EXPORT "${CMAKE_PROJECT_NAME}-targets" -- DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/" +- DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}/" + DESTINATION "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}" NAMESPACE AWS:: COMPONENT Development) -@@ -92,7 +87,7 @@ +@@ -110,7 +104,7 @@ @ONLY) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake" diff --git a/aws-c-event-stream.changes b/aws-c-event-stream.changes index 2b006b4..d531ccf 100644 --- a/aws-c-event-stream.changes +++ b/aws-c-event-stream.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Oct 3 10:28:51 UTC 2019 - John Paul Adrian Glaubitz + +- Update to version 0.1.3 + + Added support for shared/static lib builds in the same build closure +- from version 0.1.2 + + Quote TO_CMAKE_PATH args +- Refresh patches for new version + + aces_fix-cmake-modules-path.patch + ------------------------------------------------------------------- Mon Apr 22 21:15:01 UTC 2019 - John Paul Adrian Glaubitz diff --git a/aws-c-event-stream.spec b/aws-c-event-stream.spec index 73fdc82..a4257d2 100644 --- a/aws-c-event-stream.spec +++ b/aws-c-event-stream.spec @@ -18,7 +18,7 @@ %define library_version 1.0.0 %define library_soversion 0unstable Name: aws-c-event-stream -Version: 0.1.1 +Version: 0.1.3 Release: 0 Summary: C99 implementation of the vnd.amazon.eventstream content-type License: Apache-2.0 diff --git a/v0.1.1.tar.gz b/v0.1.1.tar.gz deleted file mode 100644 index 77b0582..0000000 --- a/v0.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5ff7baa4bf90da1413ebed21edbc5b6c17bc13462036d128019886edac70ba5 -size 27614 diff --git a/v0.1.3.tar.gz b/v0.1.3.tar.gz new file mode 100644 index 0000000..453b5b1 --- /dev/null +++ b/v0.1.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:63d48b85dc7bad2a23c19e4bad456e171a7551dad158229de2da46aad60d5bb0 +size 27945