diff --git a/_constraints b/_constraints index d1df24e..9cfd563 100644 --- a/_constraints +++ b/_constraints @@ -26,7 +26,7 @@ 40 - 11 + 12 diff --git a/_servicedata b/_servicedata index 1ad2c4f..0d381aa 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/SUSE/ceph.git - b18dc53186ce51c54674e993478de51ef2d434f8 \ No newline at end of file + 9f667dc3351c4c5388389f825097d7e178f6177e \ No newline at end of file diff --git a/ceph-12.0.3+git.1496902753.b18dc53186.tar.bz2 b/ceph-12.0.3+git.1496902753.b18dc53186.tar.bz2 deleted file mode 100644 index 225cae1..0000000 --- a/ceph-12.0.3+git.1496902753.b18dc53186.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b901560760761a2773c108f1048327c98ee11adf303e14015adff0e301586d4 -size 127006064 diff --git a/ceph-12.0.3+git.1496907554.cecfa2049a.tar.bz2 b/ceph-12.0.3+git.1496907554.cecfa2049a.tar.bz2 new file mode 100644 index 0000000..178664c --- /dev/null +++ b/ceph-12.0.3+git.1496907554.cecfa2049a.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87b30d893fd5074cc5d4cbed82eafc8ae82714d00a2b414abfec5df8cca85e1a +size 127017019 diff --git a/ceph-12.0.3+git.1496909744.9f667dc335.tar.bz2 b/ceph-12.0.3+git.1496909744.9f667dc335.tar.bz2 new file mode 100644 index 0000000..14956d4 --- /dev/null +++ b/ceph-12.0.3+git.1496909744.9f667dc335.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8522307cc99ecadc1c99f177e693a9d1011c941caf1ef684f7710359b9f880e9 +size 127006217 diff --git a/ceph-test.changes b/ceph-test.changes index f3b0494..ab199a3 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jun 08 08:36:57 UTC 2017 - ncutler@suse.com + +- Update to version 12.0.3+git.1496909744.9f667dc335: + + build/ops: rpm: one License line to rule them all + +------------------------------------------------------------------- +Thu Jun 8 07:23:16 UTC 2017 - ncutler@suse.com + +- up memory _constraint for ceph-test to address ppc64le OOM seen in IBS + ------------------------------------------------------------------- Thu Jun 08 06:31:53 UTC 2017 - ncutler@suse.com diff --git a/ceph-test.spec b/ceph-test.spec index 97fb82c..f43c5ec 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -69,7 +69,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 12.0.3+git.1496902753.b18dc53186 +Version: 12.0.3+git.1496909744.9f667dc335 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 1 diff --git a/ceph.changes b/ceph.changes index f3b0494..ab199a3 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jun 08 08:36:57 UTC 2017 - ncutler@suse.com + +- Update to version 12.0.3+git.1496909744.9f667dc335: + + build/ops: rpm: one License line to rule them all + +------------------------------------------------------------------- +Thu Jun 8 07:23:16 UTC 2017 - ncutler@suse.com + +- up memory _constraint for ceph-test to address ppc64le OOM seen in IBS + ------------------------------------------------------------------- Thu Jun 08 06:31:53 UTC 2017 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index ba7cc91..feea454 100644 --- a/ceph.spec +++ b/ceph.spec @@ -69,7 +69,7 @@ # main package definition ################################################################################# Name: ceph -Version: 12.0.3+git.1496902753.b18dc53186 +Version: 12.0.3+git.1496909744.9f667dc335 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 1 @@ -326,7 +326,6 @@ of cluster membership, configuration, and state. %package mgr Summary: Ceph Manager Daemon -License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and MIT %if 0%{?suse_version} Group: System/Filesystems %endif @@ -412,7 +411,6 @@ Summary: OCF-compliant resource agents for Ceph daemons %if 0%{?suse_version} Group: System/Filesystems %endif -License: LGPL-2.0 Requires: ceph-base = %{_epoch_prefix}%{version} Requires: resource-agents %description resource-agents @@ -445,7 +443,6 @@ Summary: RADOS distributed object store client library %if 0%{?suse_version} Group: System/Libraries %endif -License: LGPL-2.0 %if 0%{?rhel} || 0%{?fedora} Obsoletes: ceph-libs < %{_epoch_prefix}%{version}-%{release} %endif @@ -460,7 +457,6 @@ Summary: RADOS headers %if 0%{?suse_version} Group: Development/Libraries/C and C++ %endif -License: LGPL-2.0 Requires: librados2 = %{_epoch_prefix}%{version}-%{release} Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} Provides: librados2-devel = %{_epoch_prefix}%{version}-%{release} @@ -474,7 +470,6 @@ Summary: RADOS gateway client library %if 0%{?suse_version} Group: System/Libraries %endif -License: LGPL-2.0 Requires: librados2 = %{_epoch_prefix}%{version}-%{release} %description -n librgw2 This package provides a library implementation of the RADOS gateway @@ -485,7 +480,6 @@ Summary: RADOS gateway client library %if 0%{?suse_version} Group: Development/Libraries/C and C++ %endif -License: LGPL-2.0 Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} Provides: librgw2-devel = %{_epoch_prefix}%{version}-%{release} @@ -499,7 +493,6 @@ Summary: Python 2 libraries for the RADOS gateway %if 0%{?suse_version} Group: Development/Languages/Python %endif -License: LGPL-2.0 Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} Requires: python-rados = %{_epoch_prefix}%{version}-%{release} Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release} @@ -512,7 +505,6 @@ Summary: Python 3 libraries for the RADOS gateway %if 0%{?suse_version} Group: Development/Languages/Python %endif -License: LGPL-2.0 Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release} %description -n python%{python3_pkgversion}-rgw @@ -524,7 +516,6 @@ Summary: Python 2 libraries for the RADOS object store %if 0%{?suse_version} Group: Development/Languages/Python %endif -License: LGPL-2.0 Requires: librados2 = %{_epoch_prefix}%{version}-%{release} Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release} %description -n python-rados @@ -536,7 +527,6 @@ Summary: Python 3 libraries for the RADOS object store %if 0%{?suse_version} Group: Development/Languages/Python %endif -License: LGPL-2.0 Requires: python%{python3_pkgversion} Requires: librados2 = %{_epoch_prefix}%{version}-%{release} %description -n python%{python3_pkgversion}-rados @@ -548,7 +538,6 @@ Summary: RADOS striping interface %if 0%{?suse_version} Group: System/Libraries %endif -License: LGPL-2.0 Requires: librados2 = %{_epoch_prefix}%{version}-%{release} %description -n libradosstriper1 Striping interface built on top of the rados library, allowing @@ -560,7 +549,6 @@ Summary: RADOS striping interface headers %if 0%{?suse_version} Group: Development/Libraries/C and C++ %endif -License: LGPL-2.0 Requires: libradosstriper1 = %{_epoch_prefix}%{version}-%{release} Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} @@ -575,7 +563,6 @@ Summary: RADOS block device client library %if 0%{?suse_version} Group: System/Libraries %endif -License: LGPL-2.0 Requires: librados2 = %{_epoch_prefix}%{version}-%{release} %if 0%{?suse_version} Requires(post): coreutils @@ -594,7 +581,6 @@ Summary: RADOS block device headers %if 0%{?suse_version} Group: Development/Libraries/C and C++ %endif -License: LGPL-2.0 Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} @@ -609,7 +595,6 @@ Summary: Python 2 libraries for the RADOS block device %if 0%{?suse_version} Group: Development/Languages/Python %endif -License: LGPL-2.0 Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} Requires: python-rados = %{_epoch_prefix}%{version}-%{release} Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release} @@ -622,7 +607,6 @@ Summary: Python 3 libraries for the RADOS block device %if 0%{?suse_version} Group: Development/Languages/Python %endif -License: LGPL-2.0 Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release} %description -n python%{python3_pkgversion}-rbd @@ -634,7 +618,6 @@ Summary: Ceph distributed file system client library %if 0%{?suse_version} Group: System/Libraries %endif -License: LGPL-2.0 %if 0%{?rhel} || 0%{?fedora} Obsoletes: ceph-libs < %{_epoch_prefix}%{version}-%{release} Obsoletes: ceph-libcephfs @@ -650,7 +633,6 @@ Summary: Ceph distributed file system headers %if 0%{?suse_version} Group: Development/Libraries/C and C++ %endif -License: LGPL-2.0 Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} @@ -665,7 +647,6 @@ Summary: Python 2 libraries for Ceph distributed file system %if 0%{?suse_version} Group: Development/Languages/Python %endif -License: LGPL-2.0 Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} %if 0%{?suse_version} Recommends: python-rados = %{_epoch_prefix}%{version}-%{release} @@ -680,7 +661,6 @@ Summary: Python 3 libraries for Ceph distributed file system %if 0%{?suse_version} Group: Development/Languages/Python %endif -License: LGPL-2.0 Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release} %description -n python%{python3_pkgversion}-cephfs @@ -692,7 +672,6 @@ Summary: Python 3 utility libraries for Ceph CLI %if 0%{?suse_version} Group: Development/Languages/Python %endif -License: LGPL-2.0 %description -n python%{python3_pkgversion}-ceph-argparse This package contains types and routines for Python 3 used by the Ceph CLI as well as the RESTful interface. These have to do with querying the daemons for @@ -705,7 +684,6 @@ Summary: Ceph benchmarks and test tools %if 0%{?suse_version} Group: System/Benchmark %endif -License: LGPL-2.0 Requires: ceph-common Requires: xmlstarlet Requires: jq @@ -720,7 +698,6 @@ Summary: Java Native Interface library for CephFS Java bindings %if 0%{?suse_version} Group: System/Libraries %endif -License: LGPL-2.0 Requires: java Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} %description -n libcephfs_jni1 @@ -732,7 +709,6 @@ Summary: Development files for CephFS Java Native Interface library %if 0%{?suse_version} Group: Development/Libraries/Java %endif -License: LGPL-2.0 Requires: java Requires: libcephfs_jni1 = %{_epoch_prefix}%{version}-%{release} Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} @@ -747,7 +723,6 @@ Summary: Java libraries for the Ceph File System %if 0%{?suse_version} Group: System/Libraries %endif -License: LGPL-2.0 Requires: java Requires: libcephfs_jni1 = %{_epoch_prefix}%{version}-%{release} Requires: junit @@ -760,7 +735,6 @@ This package contains the Java libraries for the Ceph File System. %package -n rados-objclass-devel Summary: RADOS object class development kit Group: Development/Libraries -License: LGPL-2.0 Requires: librados2-devel = %{_epoch_prefix}%{version}-%{release} %description -n rados-objclass-devel This package contains libraries and headers needed to develop RADOS object @@ -790,7 +764,6 @@ Summary: Compatibility package for Cephs python libraries %if 0%{?suse_version} Group: Development/Languages/Python %endif -License: LGPL-2.0 Obsoletes: python-ceph Requires: python-rados = %{_epoch_prefix}%{version}-%{release} Requires: python-rbd = %{_epoch_prefix}%{version}-%{release}