diff --git a/aci_add-so-version.patch b/aci_add-so-version.patch index b123a7c..ef71957 100644 --- a/aci_add-so-version.patch +++ b/aci_add-so-version.patch @@ -1,11 +1,11 @@ -diff -Nru aws-c-io-0.7.0.orig/CMakeLists.txt aws-c-io-0.7.0/CMakeLists.txt ---- aws-c-io-0.7.0.orig/CMakeLists.txt 2020-11-20 01:33:59.000000000 +0100 -+++ aws-c-io-0.7.0/CMakeLists.txt 2020-11-26 16:49:35.762120326 +0100 -@@ -185,6 +185,7 @@ +diff -Nru aws-c-io-0.15.4.orig/CMakeLists.txt aws-c-io-0.15.4/CMakeLists.txt +--- aws-c-io-0.15.4.orig/CMakeLists.txt 2025-01-28 23:10:24.000000000 +0000 ++++ aws-c-io-0.15.4/CMakeLists.txt 2025-01-30 11:57:19.446194584 +0000 +@@ -176,6 +176,7 @@ # We are not ABI stable yet set_target_properties(${PROJECT_NAME} PROPERTIES VERSION 1.0.0) +set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES SOVERSION 0unstable) - target_compile_definitions(${PROJECT_NAME} PUBLIC "-DAWS_USE_${EVENT_LOOP_DEFINE}") - + if (NOT EVENT_LOOP_DEFINES) + message(FATAL_ERROR "Event Loop is not setup on the platform.") diff --git a/aci_fix-cmake-modules-path.patch b/aci_fix-cmake-modules-path.patch deleted file mode 100644 index 76a5180..0000000 --- a/aci_fix-cmake-modules-path.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Nru aws-c-io-0.7.0.orig/CMakeLists.txt aws-c-io-0.7.0/CMakeLists.txt ---- aws-c-io-0.7.0.orig/CMakeLists.txt 2020-11-20 01:33:59.000000000 +0100 -+++ aws-c-io-0.7.0/CMakeLists.txt 2020-11-24 12:38:44.025900582 +0100 -@@ -14,18 +14,8 @@ - file(TO_CMAKE_PATH "${CMAKE_INSTALL_PREFIX}" CMAKE_INSTALL_PREFIX) - endif() - -- --if (UNIX AND NOT APPLE) -- include(GNUInstallDirs) --elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR) -- set(CMAKE_INSTALL_LIBDIR "lib") --endif() -- --# 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}) -+find_package(aws-c-common REQUIRED) -+set(CMAKE_MODULE_PATH ${aws-c-common_DIR}) - - include(AwsCFlags) - include(AwsCheckHeaders) -@@ -217,7 +207,7 @@ - endif() - - install(EXPORT "${PROJECT_NAME}-targets" -- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}" -+ DESTINATION "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}/${TARGET_DIR}/" - NAMESPACE AWS:: - COMPONENT Development) - -@@ -226,7 +216,7 @@ - @ONLY) - - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake" -- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" -+ DESTINATION "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}" - COMPONENT Development) - - if (NOT CMAKE_CROSSCOMPILING) diff --git a/aws-c-io.changes b/aws-c-io.changes index 529dd2c..594c5d9 100644 --- a/aws-c-io.changes +++ b/aws-c-io.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jan 30 11:58:50 UTC 2025 - John Paul Adrian Glaubitz + +- Update to version 0.15.4 + * Switch CI to use roles by @DmitriyMusatkin in (#698) + * Fix CI for GCC-13 on Ubuntu-18 by @waahm7 in (#700) + * fix typo in log message by @graebm in (#702) + * Event Loop & Socket Type Multi-Support by @xiazhvera in (#692) + * A bunch of CMake fixes by @graebm in (#701) +- Drop aci_fix-cmake-modules-path.patch, fixed upstream +- Refresh aci_add-so-version.patch + ------------------------------------------------------------------- Thu Nov 14 12:30:11 UTC 2024 - John Paul Adrian Glaubitz diff --git a/aws-c-io.spec b/aws-c-io.spec index 13abe5e..9846be7 100644 --- a/aws-c-io.spec +++ b/aws-c-io.spec @@ -21,15 +21,14 @@ %define library_version 1.0.0 %define library_soversion 0unstable Name: aws-c-io -Version: 0.15.3 +Version: 0.15.4 Release: 0 Summary: I/O and TLS package AWS SDK for C License: Apache-2.0 Group: Development/Libraries/C and C++ URL: https://github.com/awslabs/aws-c-io Source0: https://github.com/awslabs/%{name}/archive/v%{version}.tar.gz -Patch0: aci_fix-cmake-modules-path.patch -Patch1: aci_add-so-version.patch +Patch0: aci_add-so-version.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: ninja diff --git a/v0.15.3.tar.gz b/v0.15.3.tar.gz deleted file mode 100644 index fb00b89..0000000 --- a/v0.15.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d8cb4d7d3ec4fb27cbce158d6823a1f2f5d868e116f1d6703db2ab8159343c3f -size 681849 diff --git a/v0.15.4.tar.gz b/v0.15.4.tar.gz new file mode 100644 index 0000000..465c00c --- /dev/null +++ b/v0.15.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5202033b09df61ffb2a57284a04735ac013296decc107de1c4abd1ce7d5cfda +size 687131