Merge remote-tracking branch 'origin/f29' into f28

This commit is contained in:
Kaleb S. KEITHLEY
2019-04-14 15:53:07 -04:00
3 changed files with 7 additions and 29 deletions
-24
View File
@@ -1,24 +0,0 @@
--- ceph-12.2.11/src/rgw/CMakeLists.txt.orig 2019-01-30 10:51:26.000000000 -0500
+++ ceph-12.2.11/src/rgw/CMakeLists.txt 2019-02-11 06:02:06.748608099 -0500
@@ -177,9 +177,7 @@
add_library(radosgw_a STATIC ${radosgw_srcs}
$<TARGET_OBJECTS:civetweb_common_objs>)
-if (WITH_RADOSGW_BEAST_FRONTEND AND WITH_RADOSGW_BEAST_OPENSSL)
- target_link_libraries(radosgw_a rgw_a ${SSL_LIBRARIES})
-endif()
+target_link_libraries(radosgw_a rgw_a ${SSL_LIBRARIES})
add_executable(radosgw rgw_main.cc)
target_link_libraries(radosgw radosgw_a librados
@@ -195,10 +193,6 @@
cls_version cls_replica_log cls_user)
install(TARGETS radosgw DESTINATION bin)
-if (WITH_RADOSGW_BEAST_FRONTEND)
- target_link_libraries(radosgw_a ${OPENSSL_LIBRARIES})
-endif()
-
set(radosgw_admin_srcs
rgw_admin.cc
rgw_orphan.cc)
+6 -4
View File
@@ -85,7 +85,7 @@
# main package definition
#################################################################################
Name: ceph
Version: 12.2.11
Version: 12.2.12
Release: 1%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 1
@@ -108,7 +108,6 @@ Patch002: 0002-cmake-Support-ppc64.patch
Patch003: 0003-librbd-Conditionally-import-TrimRequest.cc.patch
Patch005: 0005-src-rocksdb-table-block.h.patch
Patch007: 0007-src-osd-PrimaryLogPG.cc.patch
Patch008: 0008-src-rgw-CMakeLists.txt.patch
%if 0%{?suse_version}
%if 0%{?is_opensuse}
ExclusiveArch: x86_64 aarch64 ppc64 ppc64le
@@ -414,7 +413,7 @@ Summary: Ceph daemon for mirroring RBD images
%if 0%{?suse_version}
Group: System/Filesystems
%endif
Requires: ceph-common = %{_epoch_prefix}%{version}-%{release}
Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
%description -n rbd-mirror
Daemon for mirroring RBD images between Ceph clusters, streaming
@@ -435,7 +434,7 @@ Summary: Rados REST gateway
%if 0%{?suse_version}
Group: System/Filesystems
%endif
Requires: ceph-common = %{_epoch_prefix}%{version}-%{release}
Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
%if 0%{with selinux}
Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release}
%endif
@@ -1806,6 +1805,9 @@ exit 0
%changelog
* Fri Apr 12 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.2.12-1
- New release (1:12.2.12-1)
* Fri Feb 1 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.2.11-1
- New release (1:12.2.11-1)
+1 -1
View File
@@ -1 +1 @@
SHA512 (ceph-12.2.11.tar.gz) = 14f46cc6f38d7d894cc657a040b428309632e5c163109a8a4a79a346ba2901a37d79966a0bc09148810c22b89375d9a4cb3b23f16364685b094c518bfafe9bef
SHA512 (ceph-12.2.12.tar.gz) = e694c9a8c1f9836c08fb74b54423bdc16d4900252e34643c56cf1a615d4dacddfb13df06a6a9f68bb9d438f5f07069ed358f9fa4b5a362640a3046f9c7722dcc