SHA256
1
0
forked from pool/ceph

Accepting request 451606 from filesystems:ceph:luminous

- pre_checkin.sh: add logic to remove s390 architectures from ExclusiveArch
  line in ceph-test.spec (rationale: ceph-test is not shipped for s390x)

- Update to version 11.1.0+git.1484745543.7b08de5:
  + Update to latest upstream master (36874c8) - significant changes:
    * cmake: Turn libcommon into a shared library (PR#12840)
    * cmake: fix rpath on shared libraries and executables (PR#12927)
  + Fix build failure in ppc64le and s390x, caused by missing
    "-momit-leaf-frame-pointer" gcc option in these architectures:
    + rocksdb: build with ppc64 (PR#12908)

- Update to version 11.1.0+git.1484659687.3472421:
  + rpm: tell openSUSE to never clean the spec file
  + Enable ppc64le and s390x builds in SLE
  + rpm: lttng only on x86_64 and aarch64

- pre_checkin.sh: add logic to remove s390 architectures from ExclusiveArch
  line in ceph-test.spec (rationale: ceph-test is not shipped for s390x)

- Update to version 11.1.0+git.1484745543.7b08de5:
  + Update to latest upstream master (36874c8) - significant changes:
    * cmake: Turn libcommon into a shared library (PR#12840)
    * cmake: fix rpath on shared libraries and executables (PR#12927)
  + Fix build failure in ppc64le and s390x, caused by missing
    "-momit-leaf-frame-pointer" gcc option in these architectures:
    + rocksdb: build with ppc64 (PR#12908)

- Update to version 11.1.0+git.1484659687.3472421:
  + rpm: tell openSUSE to never clean the spec file
  + Enable ppc64le and s390x builds in SLE

OBS-URL: https://build.opensuse.org/request/show/451606
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=71
This commit is contained in:
2017-01-20 11:29:05 +00:00
committed by Git OBS Bridge
parent 8ffe7c59c0
commit 367e95bd7f
8 changed files with 74 additions and 12 deletions

View File

@@ -13,7 +13,7 @@
#
# Please submit bugfixes or comments via http://tracker.ceph.com/
#
%bcond_without cephfs_java
%bcond_with cephfs_java
%if 0%{?suse_version}
%bcond_without ceph_test_package
%else
@@ -27,7 +27,7 @@
# no gperftools/tcmalloc on s390(x)
%bcond_with tcmalloc
%endif
%bcond_with lowmem_builder
%bcond_without lowmem_builder
%bcond_with minimal_debugging_information
%if 0%{?fedora} || 0%{?rhel}
%bcond_with ocf
@@ -44,9 +44,11 @@
# LTTng-UST enabled on Fedora, RHEL 6+, and SLE (not openSUSE)
%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
%if ! 0%{?is_opensuse}
%ifarch x86_64 aarch64
%bcond_without lttng
%endif
%endif
%endif
%if %{with selinux}
# get selinux policy version
@@ -65,7 +67,7 @@
# common
#################################################################################
Name: ceph-test
Version: 11.1.0+git.1483528076.d86680e
Version: 11.1.0+git.1484905510.4daa416
Release: 0
Summary: Ceph benchmarks and test tools
License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT
@@ -86,7 +88,7 @@ Source99: ceph-rpmlintrc
%if 0%{?is_opensuse}
ExclusiveArch: x86_64 aarch64 ppc64 ppc64le
%else
ExclusiveArch: x86_64 aarch64
ExclusiveArch: x86_64 aarch64 ppc64le
%endif
%endif
#################################################################################
@@ -556,6 +558,7 @@ rm -rf %{buildroot}%{_unitdir}/ceph-osd.target
rm -rf %{buildroot}%{_unitdir}/ceph-disk@.service
rm -rf %{buildroot}%{_prefix}/lib/ocf/resource.d/ceph/rbd
rm -rf %{buildroot}%{_libdir}/librados.so.*
rm -rf %{buildroot}%{_libdir}/ceph/libceph-common.so
rm -rf %{buildroot}%{_libdir}/librados_tp.so.*
rm -rf %{buildroot}%{_includedir}/rados/librados.h
rm -rf %{buildroot}%{_includedir}/rados/librados.hpp
@@ -790,3 +793,4 @@ rm -rf %{buildroot}
%if 0%{with selinux}
%endif # with selinux
%changelog
# nospeccleaner