Accepting request 1243442 from devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/1243442
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aws-c-sdkutils?expand=0&rev=9
This commit is contained in:
Ana Guerrero 2025-02-06 21:05:03 +00:00 committed by Git OBS Bridge
commit d87c0c8543
5 changed files with 11 additions and 46 deletions

View File

@ -1,41 +0,0 @@
diff -Nru aws-c-sdkutils-0.1.2.orig/CMakeLists.txt aws-c-sdkutils-0.1.2/CMakeLists.txt
--- aws-c-sdkutils-0.1.2.orig/CMakeLists.txt 2022-02-07 21:12:21.000000000 +0000
+++ aws-c-sdkutils-0.1.2/CMakeLists.txt 2022-04-28 13:37:14.026977223 +0000
@@ -16,18 +16,11 @@
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})
+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules")
+include(GNUInstallDirs)
include(AwsCFlags)
include(AwsCheckHeaders)
@@ -94,12 +87,12 @@
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)
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)
install(FILES ${EXPORT_MODULES}

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jan 30 12:20:14 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to version 0.2.3
* A bunch of CMake fixes by @graebm in (#50)
- Drop acs_fix-cmake-modules-path.patch, fixed upstream
-------------------------------------------------------------------
Thu Jan 9 10:39:28 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>

View File

@ -20,14 +20,13 @@
%define library_pkg 1_0_0
%define library_soversion 1
Name: aws-c-sdkutils
Version: 0.2.2
Version: 0.2.3
Release: 0
Summary: AWS C SDK Utils
License: Apache-2.0
Group: Development/Libraries/C and C++
URL: https://github.com/awslabs/aws-c-sdkutils
Source0: https://github.com/awslabs/%{name}/archive/v%{version}.tar.gz
Patch0: acs_fix-cmake-modules-path.patch
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: ninja

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:75defbfd4d896b8bdc0790bd25d854218acae61b9409d1956d33832924b82045
size 79984

3
v0.2.3.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5a0489d508341b84eea556e351717bc33524d3dfd6207ee3aba6068994ea6018
size 79833