Browse code
Add s3 to list of aws sdk libraries, remove unused ones
Change-Id: I198af84627aa5a019edcadea7a022e69c564a8ff
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5121
Reviewed-by: Sharath George
Tested-by: Sharath George
suezzelur authored on 2018/05/05 05:43:48Showing 1 changed files
| ... | ... |
@@ -3,7 +3,7 @@ Summary: aws sdk for c++ |
| 3 | 3 |
Group: Development/Libraries |
| 4 | 4 |
Name: aws-sdk-cpp |
| 5 | 5 |
Version: 1.4.33 |
| 6 |
-Release: 2%{?dist}
|
|
| 6 |
+Release: 3%{?dist}
|
|
| 7 | 7 |
Vendor: VMware, Inc. |
| 8 | 8 |
Distribution: Photon |
| 9 | 9 |
License: Apache 2.0 |
| ... | ... |
@@ -15,6 +15,7 @@ Requires: curl-devel |
| 15 | 15 |
Requires: zlib-devel |
| 16 | 16 |
Requires: aws-sdk-core = %{version}-%{release}
|
| 17 | 17 |
Requires: aws-sdk-kinesis = %{version}-%{release}
|
| 18 |
+Requires: aws-sdk-s3 = %{version}-%{release}
|
|
| 18 | 19 |
BuildRequires: cmake |
| 19 | 20 |
BuildRequires: curl-devel |
| 20 | 21 |
BuildRequires: openssl-devel |
| ... | ... |
@@ -45,6 +46,7 @@ aws core libs |
| 45 | 45 |
Summary: aws sdk kinesis |
| 46 | 46 |
Group: Development/Libraries |
| 47 | 47 |
Requires: aws-sdk-core = %{version}-%{release}
|
| 48 |
+Requires: aws-kinesis-libs = %{version}-%{release}
|
|
| 48 | 49 |
|
| 49 | 50 |
%description -n aws-sdk-kinesis |
| 50 | 51 |
aws sdk cpp for kinesis |
| ... | ... |
@@ -57,6 +59,23 @@ Requires: aws-core-libs = %{version}-%{release}
|
| 57 | 57 |
%description -n aws-kinesis-libs |
| 58 | 58 |
aws kinesis libs |
| 59 | 59 |
|
| 60 |
+%package -n aws-sdk-s3 |
|
| 61 |
+Summary: aws sdk s3 |
|
| 62 |
+Group: Development/Libraries |
|
| 63 |
+Requires: aws-sdk-core = %{version}-%{release}
|
|
| 64 |
+Requires: aws-s3-libs = %{version}-%{release}
|
|
| 65 |
+ |
|
| 66 |
+%description -n aws-sdk-s3 |
|
| 67 |
+aws sdk cpp for s3 |
|
| 68 |
+ |
|
| 69 |
+%package -n aws-s3-libs |
|
| 70 |
+Summary: aws s3 libs |
|
| 71 |
+Group: Development/Libraries |
|
| 72 |
+Requires: aws-core-libs = %{version}-%{release}
|
|
| 73 |
+ |
|
| 74 |
+%description -n aws-s3-libs |
|
| 75 |
+aws s3 libs |
|
| 76 |
+ |
|
| 60 | 77 |
%prep |
| 61 | 78 |
%setup |
| 62 | 79 |
|
| ... | ... |
@@ -66,12 +85,20 @@ cd build |
| 66 | 66 |
cmake \ |
| 67 | 67 |
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
|
| 68 | 68 |
-DCMAKE_BUILD_TYPE=Release .. |
| 69 |
-make %{?_smp_mflags}
|
|
| 69 |
+for component in "core" "kinesis" "s3"; do |
|
| 70 |
+ cd aws-cpp-sdk-$component |
|
| 71 |
+ make %{?_smp_mflags}
|
|
| 72 |
+ cd .. |
|
| 73 |
+done |
|
| 70 | 74 |
|
| 71 | 75 |
|
| 72 | 76 |
%install |
| 73 | 77 |
cd build |
| 74 |
-make DESTDIR=%{buildroot} install
|
|
| 78 |
+for component in "core" "kinesis" "s3"; do |
|
| 79 |
+ cd aws-cpp-sdk-$component |
|
| 80 |
+ make DESTDIR=%{buildroot} install
|
|
| 81 |
+ cd .. |
|
| 82 |
+done |
|
| 75 | 83 |
rm -rf %{buildroot}%{_lib64dir}/cmake
|
| 76 | 84 |
|
| 77 | 85 |
%clean |
| ... | ... |
@@ -109,12 +136,13 @@ rm -rf %{buildroot}/*
|
| 109 | 109 |
%defattr(-,root,root,0755) |
| 110 | 110 |
%exclude %{_includedir}/aws/core
|
| 111 | 111 |
%exclude %{_includedir}/aws/kinesis
|
| 112 |
+ %exclude %{_includedir}/aws/s3
|
|
| 112 | 113 |
%exclude %{_lib64dir}/pkgconfig/aws-cpp-sdk-core.pc
|
| 113 | 114 |
%exclude %{_lib64dir}/pkgconfig/aws-cpp-sdk-kinesis.pc
|
| 115 |
+ %exclude %{_lib64dir}/pkgconfig/aws-cpp-sdk-s3.pc
|
|
| 114 | 116 |
%exclude %{_lib64dir}/libaws-cpp-sdk-core.so
|
| 115 |
- %exclude %{_lib64dir}/libaws-cpp-sdk-core.so
|
|
| 116 |
- %{_lib64dir}/*
|
|
| 117 |
- %{_includedir}/*
|
|
| 117 |
+ %exclude %{_lib64dir}/libaws-cpp-sdk-kinesis.so
|
|
| 118 |
+ %exclude %{_lib64dir}/libaws-cpp-sdk-s3.so
|
|
| 118 | 119 |
|
| 119 | 120 |
%files -n aws-sdk-core |
| 120 | 121 |
%defattr(-,root,root,0755) |
| ... | ... |
@@ -134,7 +162,18 @@ rm -rf %{buildroot}/*
|
| 134 | 134 |
%defattr(-,root,root,0755) |
| 135 | 135 |
%{_lib64dir}/libaws-cpp-sdk-kinesis.so
|
| 136 | 136 |
|
| 137 |
+%files -n aws-sdk-s3 |
|
| 138 |
+ %defattr(-,root,root,0755) |
|
| 139 |
+ %{_includedir}/aws/s3/*
|
|
| 140 |
+ %{_lib64dir}/pkgconfig/aws-cpp-sdk-s3.pc
|
|
| 141 |
+ |
|
| 142 |
+%files -n aws-s3-libs |
|
| 143 |
+ %defattr(-,root,root,0755) |
|
| 144 |
+ %{_lib64dir}/libaws-cpp-sdk-s3.so
|
|
| 145 |
+ |
|
| 137 | 146 |
%changelog |
| 147 |
+* Thu May 03 2018 Anish Swaminathan <anishs@vmware.com> 1.4.33-3 |
|
| 148 |
+- Add s3 and only build the core, kinesis and s3 |
|
| 138 | 149 |
* Thu Apr 12 2018 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.4.33-2 |
| 139 | 150 |
- Split core and kinesis to separate pkgs |
| 140 | 151 |
* Wed Apr 11 2018 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.4.33-1 |