SHA256
1
0
forked from pool/ceph

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
This commit is contained in:
Nathan Cutler 2017-06-08 05:41:17 +00:00 committed by Git OBS Bridge
parent 08319c2eab
commit 02d07828d6
8 changed files with 38 additions and 9 deletions

View File

@ -6,7 +6,7 @@
<param name="filename">ceph</param> <param name="filename">ceph</param>
<param name="scm">git</param> <param name="scm">git</param>
<param name="package-meta">no</param> <param name="package-meta">no</param>
<param name="changesgenerate">disable</param> <param name="changesgenerate">enable</param>
<param name="commandtorun">sh etc/ceph_ver_hack.sh</param> <param name="commandtorun">sh etc/ceph_ver_hack.sh</param>
</service> </service>
<service name="extract_ceph_spec" mode="disabled" /> <service name="extract_ceph_spec" mode="disabled" />

View File

@ -1,4 +1,4 @@
<servicedata> <servicedata>
<service name="tar_scm"> <service name="tar_scm">
<param name="url">git://github.com/SUSE/ceph.git</param> <param name="url">git://github.com/SUSE/ceph.git</param>
<param name="changesrevision">f1d61158619f54143fcd4a97b9575bae79f27afa</param></service></servicedata> <param name="changesrevision">0ec641fe54df59a980a2619652206a5248ded29a</param></service></servicedata>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f62404b9c1cebe91288bda4e4f053b7c42d9d09a9387f81d2a1549d59d7c164f
size 127009528

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f57ebef4ec7c0584acb3eadc92f315d643f3ad48496dcc6875b754c6f8eca4a8
size 127008269

View File

@ -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 Sat Jun 3 15:53:05 UTC 2017 - ncutler@suse.com

View File

@ -69,7 +69,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph-test Name: ceph-test
Version: 12.0.3+git.1496494491.ba3c561a92 Version: 12.0.3+git.1496899012.0ec641fe54
Release: 0%{?dist} Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 1 Epoch: 1
@ -79,7 +79,7 @@ Epoch: 1
%global _epoch_prefix %{?epoch:%{epoch}:} %global _epoch_prefix %{?epoch:%{epoch}:}
Summary: Ceph benchmarks and test tools 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} %if 0%{?suse_version}
Group: System/Filesystems Group: System/Filesystems
%endif %endif
@ -105,6 +105,7 @@ ExclusiveArch: x86_64 aarch64 ppc64le
Requires: ceph-common Requires: ceph-common
Requires: xmlstarlet Requires: xmlstarlet
Requires: jq
Requires(post): binutils Requires(post): binutils
%if 0%{with cephfs_java} %if 0%{with cephfs_java}
BuildRequires: java-devel BuildRequires: java-devel

View File

@ -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 Sat Jun 3 15:53:05 UTC 2017 - ncutler@suse.com

View File

@ -69,7 +69,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 12.0.3+git.1496494491.ba3c561a92 Version: 12.0.3+git.1496899012.0ec641fe54
Release: 0%{?dist} Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 1 Epoch: 1
@ -79,7 +79,7 @@ Epoch: 1
%global _epoch_prefix %{?epoch:%{epoch}:} %global _epoch_prefix %{?epoch:%{epoch}:}
Summary: User space components of the Ceph file system 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} %if 0%{?suse_version}
Group: System/Filesystems Group: System/Filesystems
%endif %endif
@ -708,6 +708,7 @@ Group: System/Benchmark
License: LGPL-2.0 License: LGPL-2.0
Requires: ceph-common Requires: ceph-common
Requires: xmlstarlet Requires: xmlstarlet
Requires: jq
%description -n ceph-test %description -n ceph-test
This package contains Ceph benchmarks and test tools. This package contains Ceph benchmarks and test tools.
%endif %endif
@ -774,6 +775,7 @@ Group: System/Filesystems
%endif %endif
Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
Requires: policycoreutils, libselinux-utils Requires: policycoreutils, libselinux-utils
Requires(post): ceph-base = %{_epoch_prefix}%{version}-%{release}
Requires(post): selinux-policy-base >= %{_selinux_policy_version}, policycoreutils, gawk Requires(post): selinux-policy-base >= %{_selinux_policy_version}, policycoreutils, gawk
Requires(postun): policycoreutils Requires(postun): policycoreutils
%description selinux %description selinux