From af93d9a113c928b15d6351fd33b594d4e5564cb9 Mon Sep 17 00:00:00 2001 From: liuheng Date: Sat, 28 Dec 2024 10:19:36 +0800 Subject: [PATCH] Revert "adopt to new cmake macro" This reverts commit 95f313503fa287c7d514bb79c769ff78e4b3833a. --- aws-sdk-cpp.spec | 60 ++++++++++++++++++++++++------------------------ aws-sdk-cpp.yaml | 4 ---- 2 files changed, 30 insertions(+), 34 deletions(-) delete mode 100644 aws-sdk-cpp.yaml diff --git a/aws-sdk-cpp.spec b/aws-sdk-cpp.spec index eded1a1..c28a71c 100644 --- a/aws-sdk-cpp.spec +++ b/aws-sdk-cpp.spec @@ -1,62 +1,62 @@ Name: aws-sdk-cpp Version: 1.11.327 -Release: 3 +Release: 2 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 +URL: https://github.com/aws/aws-sdk-cpp.git Source0: https://github.com/aws/aws-sdk-cpp/archive/refs/tags/%{name}-%{version}.tar.gz -BuildRequires: cmake >= 3.13 -BuildRequires: gcc gcc-c++ -BuildRequires: libcurl-devel -BuildRequires: openssl-devel -BuildRequires: zlib-devel +BuildRequires: tar cmake gcc-c++ gcc +BuildRequires: libcurl-devel openssl-devel zlib-devel + +Requires: libcurl openssl zlib %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. -%package devel -Summary: Development files for %{name} -Requires: %{name} = %{version}-%{release} - -%description devel -The %{name}-devel package contains libraries and header files for %{name}. +%global debug_package %{nil} %prep %autosetup -p1 %build -%{cmake} \ - -B %{__cmake_builddir} \ +mkdir -p tmp_build +pushd tmp_build +%{cmake} .. \ -DBUILD_ONLY="s3" \ - -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_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_SHARED_LINKER_FLAGS="-Wl,-z,relro,-z,now %{build_ldflags}" \ -DCMAKE_SKIP_RPATH=TRUE \ -DCMAKE_BUILD_TYPE=Release \ -DAUTORUN_UNIT_TESTS=OFF -%cmake_build +%make_build -s %{?_smp_mflags} +popd %install -%cmake_install +pushd tmp_build +make install -s %{?_smp_mflags} DESTDIR=%{buildroot} +popd %files -%{_libdir}/*.so +%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 -%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 deleted file mode 100644 index 2c1a0fc..0000000 --- a/aws-sdk-cpp.yaml +++ /dev/null @@ -1,4 +0,0 @@ -version_control: github -src_repo: aws/aws-sdk-cpp -tag_prefix: -separator: .