From 95f313503fa287c7d514bb79c769ff78e4b3833a Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Wed, 27 Nov 2024 11:56:09 +0800 Subject: [PATCH] adopt to new cmake macro (cherry picked from commit a669edb3629998f55fe66cb5e8f53d16b41898f5) --- aws-sdk-cpp.spec | 60 ++++++++++++++++++++++++------------------------ aws-sdk-cpp.yaml | 4 ++++ 2 files changed, 34 insertions(+), 30 deletions(-) create mode 100644 aws-sdk-cpp.yaml diff --git a/aws-sdk-cpp.spec b/aws-sdk-cpp.spec index c28a71c..eded1a1 100644 --- a/aws-sdk-cpp.spec +++ b/aws-sdk-cpp.spec @@ -1,62 +1,62 @@ Name: aws-sdk-cpp Version: 1.11.327 -Release: 2 +Release: 3 Summary: The AWS SDK for C++ provides a modern C++ interface for AWS License: Apache-2.0 -URL: https://github.com/aws/aws-sdk-cpp.git +URL: https://github.com/aws/aws-sdk-cpp Source0: https://github.com/aws/aws-sdk-cpp/archive/refs/tags/%{name}-%{version}.tar.gz -BuildRequires: tar cmake gcc-c++ gcc -BuildRequires: libcurl-devel openssl-devel zlib-devel - -Requires: libcurl openssl zlib +BuildRequires: cmake >= 3.13 +BuildRequires: gcc gcc-c++ +BuildRequires: libcurl-devel +BuildRequires: openssl-devel +BuildRequires: zlib-devel %description The AWS SDK for C++ provides a modern C++ (version C++ 11 or later) interface for Amazon Web Services (AWS). This package contains the S3 component. -%global debug_package %{nil} +%package devel +Summary: Development files for %{name} +Requires: %{name} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for %{name}. %prep %autosetup -p1 %build -mkdir -p tmp_build -pushd tmp_build -%{cmake} .. \ +%{cmake} \ + -B %{__cmake_builddir} \ -DBUILD_ONLY="s3" \ - -DCMAKE_CXX_FLAGS="%{optflags} -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0 -fstack-protector-strong" \ - -DCMAKE_C_FLAGS="%{optflags} -std=c99 -D_GLIBCXX_USE_CXX11_ABI=0 -fstack-protector-strong" \ + -DCMAKE_CXX_FLAGS="%{build_cxxflags} -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0 -fstack-protector-strong" \ + -DCMAKE_C_FLAGS="%{build_cflags} -std=c99 -D_GLIBCXX_USE_CXX11_ABI=0 -fstack-protector-strong" \ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,-z,relro,-z,now %{build_ldflags}" \ -DCMAKE_SKIP_RPATH=TRUE \ -DCMAKE_BUILD_TYPE=Release \ -DAUTORUN_UNIT_TESTS=OFF -%make_build -s %{?_smp_mflags} -popd +%cmake_build %install -pushd tmp_build -make install -s %{?_smp_mflags} DESTDIR=%{buildroot} -popd +%cmake_install %files -%doc -%defattr(-,root,root) -%{_prefix}/include/aws -%{_prefix}/include/s2n -%{_prefix}/include/s2n.h -%{_prefix}/include/smithy -%{_libdir}/aws* -%{_libdir}/cmake -%{_libdir}/libaws* -%{_libdir}/libs2n* -%{_libdir}/libtesting* -%{_libdir}/pkgconfig -%{_libdir}/s2n +%{_libdir}/*.so +%files devel +%{_includedir}/* +%{_libdir}/*.a +%{_libdir}/pkgconfig/* +%{_libdir}/cmake/* +%{_libdir}/*/cmake %changelog +* Wed Nov 27 2024 Funda Wang - 1.11.327-3 +- adopt to new cmake macro +- split out devel package + * Fri Nov 22 2024 liuheng - 1.11.327-2 - fix bug diff --git a/aws-sdk-cpp.yaml b/aws-sdk-cpp.yaml new file mode 100644 index 0000000..2c1a0fc --- /dev/null +++ b/aws-sdk-cpp.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: aws/aws-sdk-cpp +tag_prefix: +separator: . -- Gitee