From 50d469f261e6c6bc09dfca5177d47d56abc3a701eb7cb2077a391eec0c162dc4 Mon Sep 17 00:00:00 2001 From: Tim Serong Date: Fri, 28 Jul 2017 14:45:21 +0000 Subject: [PATCH] Accepting request 512937 from filesystems:ceph:luminous - Update to version 12.1.1+git.1501231943.67577225bc + Notable changes: * rgw_file: properly & |'d flags (bsc#1047977) - Update to version 12.1.1+git.1501231943.67577225bc + Notable changes: * rgw_file: properly & |'d flags (bsc#1047977) OBS-URL: https://build.opensuse.org/request/show/512937 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=108 --- ceph-12.1.1+git.1500447879.e5aac115d7.tar.bz2 | 3 --- ceph-12.1.1+git.1501231943.67577225bc.tar.bz2 | 3 +++ ceph-test.changes | 7 +++++++ ceph-test.spec | 16 +++------------- ceph.changes | 7 +++++++ ceph.spec | 18 +++--------------- 6 files changed, 23 insertions(+), 31 deletions(-) delete mode 100644 ceph-12.1.1+git.1500447879.e5aac115d7.tar.bz2 create mode 100644 ceph-12.1.1+git.1501231943.67577225bc.tar.bz2 diff --git a/ceph-12.1.1+git.1500447879.e5aac115d7.tar.bz2 b/ceph-12.1.1+git.1500447879.e5aac115d7.tar.bz2 deleted file mode 100644 index df5f9c5..0000000 --- a/ceph-12.1.1+git.1500447879.e5aac115d7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f849dc7a137e2c7f5e20280d96463959bf542563936dbb00bf200c20a7a02fdc -size 127141620 diff --git a/ceph-12.1.1+git.1501231943.67577225bc.tar.bz2 b/ceph-12.1.1+git.1501231943.67577225bc.tar.bz2 new file mode 100644 index 0000000..2e80620 --- /dev/null +++ b/ceph-12.1.1+git.1501231943.67577225bc.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce2bb2e086a0887ce4d254d3a738602b47788a73e4aea0706c327574ba341b0d +size 127501094 diff --git a/ceph-test.changes b/ceph-test.changes index 471a1aa..ece8e8d 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jul 28 14:34:34 UTC 2017 - tserong@suse.com + +- Update to version 12.1.1+git.1501231943.67577225bc + + Notable changes: + * rgw_file: properly & |'d flags (bsc#1047977) + ------------------------------------------------------------------- Wed Jul 19 08:11:53 UTC 2017 - ncutler@suse.com diff --git a/ceph-test.spec b/ceph-test.spec index 35b46f6..ca0907e 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -21,7 +21,6 @@ %bcond_without ceph_test_package %endif %bcond_with make_check -%bcond_with xio %ifarch s390 s390x %bcond_with tcmalloc %else @@ -69,7 +68,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 12.1.1+git.1500447879.e5aac115d7 +Version: 12.1.1+git.1501231943.67577225bc Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -106,6 +105,7 @@ ExclusiveArch: x86_64 aarch64 ppc64le Requires: ceph-common Requires: xmlstarlet Requires: jq +Requires: socat Requires(post): binutils %if 0%{with cephfs_java} BuildRequires: java-devel @@ -233,10 +233,6 @@ BuildRequires: expat-devel %if 0%{?fedora} || 0%{?rhel} BuildRequires: redhat-rpm-config %endif -# Accelio IB/RDMA -%if 0%{with xio} -BuildRequires: libxio-devel -%endif %description This package contains Ceph benchmarks and test tools. @@ -250,8 +246,6 @@ This package contains Ceph benchmarks and test tools. %endif %if 0%{?suse_version} %endif -%if 0%{with xio} -%endif %if 0%{?suse_version} %endif %if 0%{?fedora} || 0%{?rhel} @@ -260,8 +254,6 @@ This package contains Ceph benchmarks and test tools. %endif %if 0%{?suse_version} %endif -%if 0%{with xio} -%endif %if 0%{?suse_version} %endif %if 0%{?suse_version} @@ -417,6 +409,7 @@ cmake .. \ -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \ -DCMAKE_INSTALL_MANDIR=%{_mandir} \ -DCMAKE_INSTALL_DOCDIR=%{_docdir}/ceph \ + -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \ -DWITH_EMBEDDED=OFF \ -DWITH_MANPAGE=ON \ -DWITH_PYTHON3=ON \ @@ -424,9 +417,6 @@ cmake .. \ %if 0%{?rhel} && ! 0%{?centos} -DWITH_SUBMAN=ON \ %endif -%if 0%{with xio} - -DWITH_XIO=ON \ -%endif %if 0%{without ceph_test_package} -DWITH_TESTS=OFF \ %endif diff --git a/ceph.changes b/ceph.changes index 471a1aa..ece8e8d 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jul 28 14:34:34 UTC 2017 - tserong@suse.com + +- Update to version 12.1.1+git.1501231943.67577225bc + + Notable changes: + * rgw_file: properly & |'d flags (bsc#1047977) + ------------------------------------------------------------------- Wed Jul 19 08:11:53 UTC 2017 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index 3198883..d02dc98 100644 --- a/ceph.spec +++ b/ceph.spec @@ -21,7 +21,6 @@ %bcond_without ceph_test_package %endif %bcond_with make_check -%bcond_with xio %ifarch s390 s390x %bcond_with tcmalloc %else @@ -69,7 +68,7 @@ # main package definition ################################################################################# Name: ceph -Version: 12.1.1+git.1500447879.e5aac115d7 +Version: 12.1.1+git.1501231943.67577225bc Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -227,10 +226,6 @@ BuildRequires: expat-devel %if 0%{?fedora} || 0%{?rhel} BuildRequires: redhat-rpm-config %endif -# Accelio IB/RDMA -%if 0%{with xio} -BuildRequires: libxio-devel -%endif %description Ceph is a massively scalable, open-source, distributed storage system that runs @@ -267,9 +262,6 @@ Requires: which %if 0%{?suse_version} Recommends: ntp-daemon %endif -%if 0%{with xio} -Requires: libxio -%endif %description base Base is the package that includes all the files shared amongst ceph servers @@ -297,9 +289,6 @@ Requires: python-requests PreReq: permissions Requires(pre): shadow %endif -%if 0%{with xio} -Requires: libxio -%endif %description -n ceph-common Common utilities to mount and interact with a ceph storage cluster. Comprised of files that are common to Ceph clients and servers. @@ -699,6 +688,7 @@ Group: System/Benchmark Requires: ceph-common Requires: xmlstarlet Requires: jq +Requires: socat %description -n ceph-test This package contains Ceph benchmarks and test tools. %endif @@ -842,6 +832,7 @@ cmake .. \ -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \ -DCMAKE_INSTALL_MANDIR=%{_mandir} \ -DCMAKE_INSTALL_DOCDIR=%{_docdir}/ceph \ + -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \ -DWITH_EMBEDDED=OFF \ -DWITH_MANPAGE=ON \ -DWITH_PYTHON3=ON \ @@ -849,9 +840,6 @@ cmake .. \ %if 0%{?rhel} && ! 0%{?centos} -DWITH_SUBMAN=ON \ %endif -%if 0%{with xio} - -DWITH_XIO=ON \ -%endif %if 0%{without ceph_test_package} -DWITH_TESTS=OFF \ %endif