From 02d07828d62da5a9429a1722344d0dcd3fd1856905f624c72b878a95a6c15be9 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Thu, 8 Jun 2017 05:41:17 +0000 Subject: [PATCH] Accepting request 501841 from filesystems:ceph:luminous fix legaldb issue OBS-URL: https://build.opensuse.org/request/show/501841 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=90 --- _service | 2 +- _servicedata | 2 +- ceph-12.0.3+git.1496494491.ba3c561a92.tar.bz2 | 3 --- ceph-12.0.3+git.1496899012.0ec641fe54.tar.bz2 | 3 +++ ceph-test.changes | 13 +++++++++++++ ceph-test.spec | 5 +++-- ceph.changes | 13 +++++++++++++ ceph.spec | 6 ++++-- 8 files changed, 38 insertions(+), 9 deletions(-) delete mode 100644 ceph-12.0.3+git.1496494491.ba3c561a92.tar.bz2 create mode 100644 ceph-12.0.3+git.1496899012.0ec641fe54.tar.bz2 diff --git a/_service b/_service index 87df822..4ee148e 100644 --- a/_service +++ b/_service @@ -6,7 +6,7 @@ ceph git no - disable + enable sh etc/ceph_ver_hack.sh diff --git a/_servicedata b/_servicedata index c3a4337..b27771c 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/SUSE/ceph.git - f1d61158619f54143fcd4a97b9575bae79f27afa \ No newline at end of file + 0ec641fe54df59a980a2619652206a5248ded29a \ No newline at end of file diff --git a/ceph-12.0.3+git.1496494491.ba3c561a92.tar.bz2 b/ceph-12.0.3+git.1496494491.ba3c561a92.tar.bz2 deleted file mode 100644 index 647851d..0000000 --- a/ceph-12.0.3+git.1496494491.ba3c561a92.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f62404b9c1cebe91288bda4e4f053b7c42d9d09a9387f81d2a1549d59d7c164f -size 127009528 diff --git a/ceph-12.0.3+git.1496899012.0ec641fe54.tar.bz2 b/ceph-12.0.3+git.1496899012.0ec641fe54.tar.bz2 new file mode 100644 index 0000000..bf5b54e --- /dev/null +++ b/ceph-12.0.3+git.1496899012.0ec641fe54.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f57ebef4ec7c0584acb3eadc92f315d643f3ad48496dcc6875b754c6f8eca4a8 +size 127008269 diff --git a/ceph-test.changes b/ceph-test.changes index cb78b34..e9478ed 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Jun 08 05:29:08 UTC 2017 - ncutler@suse.com + +- Update to version 12.0.3+git.1496899012.0ec641fe54: + + build/ops: rpm, COPYING: drop GPL 2.0 with Autoconf Exception + (autoconf no longer used) + +------------------------------------------------------------------- +Wed Jun 7 12:26:46 UTC 2017 - ncutler@suse.com + +- Update to version 12.0.3+git.1496754880.35cb2861ce: + + merge upstream master (b1d06a6b54) + ------------------------------------------------------------------- Sat Jun 3 15:53:05 UTC 2017 - ncutler@suse.com diff --git a/ceph-test.spec b/ceph-test.spec index 89ef567..bbebb0d 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -69,7 +69,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 12.0.3+git.1496494491.ba3c561a92 +Version: 12.0.3+git.1496899012.0ec641fe54 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 1 @@ -79,7 +79,7 @@ Epoch: 1 %global _epoch_prefix %{?epoch:%{epoch}:} 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-2.0 and BSD-3-Clause and MIT +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 @@ -105,6 +105,7 @@ ExclusiveArch: x86_64 aarch64 ppc64le Requires: ceph-common Requires: xmlstarlet +Requires: jq Requires(post): binutils %if 0%{with cephfs_java} BuildRequires: java-devel diff --git a/ceph.changes b/ceph.changes index cb78b34..e9478ed 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Jun 08 05:29:08 UTC 2017 - ncutler@suse.com + +- Update to version 12.0.3+git.1496899012.0ec641fe54: + + build/ops: rpm, COPYING: drop GPL 2.0 with Autoconf Exception + (autoconf no longer used) + +------------------------------------------------------------------- +Wed Jun 7 12:26:46 UTC 2017 - ncutler@suse.com + +- Update to version 12.0.3+git.1496754880.35cb2861ce: + + merge upstream master (b1d06a6b54) + ------------------------------------------------------------------- Sat Jun 3 15:53:05 UTC 2017 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index 7841f4e..e0998ad 100644 --- a/ceph.spec +++ b/ceph.spec @@ -69,7 +69,7 @@ # main package definition ################################################################################# Name: ceph -Version: 12.0.3+git.1496494491.ba3c561a92 +Version: 12.0.3+git.1496899012.0ec641fe54 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 1 @@ -79,7 +79,7 @@ Epoch: 1 %global _epoch_prefix %{?epoch:%{epoch}:} Summary: User space components of the Ceph file system -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-2.0 and BSD-3-Clause and MIT +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 @@ -708,6 +708,7 @@ Group: System/Benchmark License: LGPL-2.0 Requires: ceph-common Requires: xmlstarlet +Requires: jq %description -n ceph-test This package contains Ceph benchmarks and test tools. %endif @@ -774,6 +775,7 @@ Group: System/Filesystems %endif Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} Requires: policycoreutils, libselinux-utils +Requires(post): ceph-base = %{_epoch_prefix}%{version}-%{release} Requires(post): selinux-policy-base >= %{_selinux_policy_version}, policycoreutils, gawk Requires(postun): policycoreutils %description selinux