pool/ceph
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 545532 from filesystems:ceph:mimic

Browse Source 
13.0.0

OBS-URL: https://build.opensuse.org/request/show/545532
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=148
This commit is contained in:
Nathan Cutler 2017-11-25 16:38:36 +00:00 committed by Git OBS Bridge
parent 4d15e838cb
commit cc459c2bc7
7 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceph-13.0.0-3522-g2d444b010f.tar.bz2
View File

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

3
ceph-13.0.0-3531-g9dbb709d3f.tar.bz2 Normal file
View File

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

2
ceph-test.changes
View File

@ -1,7 +1,7 @@
-------------------------------------------------------------------
Sat Nov 25 14:31:00 UTC 2017 - ncutler@suse.com
- Update to version 13.0.0-3522.g2d444b010f:
- Update to version 13.0.0-3531.g9dbb709d3f:
+ rebase to latest upstream master
+ Add "checkin.sh" script to automate the checkin process, along
with a "README-checkin.txt" file containing basic information.

20
ceph-test.spec
View File

@ -63,7 +63,7 @@
#################################################################################
Name: ceph-test
Version: 13.0.0
Release: 3522.g2d444b010f%{?dist}
Release: 3531.g9dbb709d3f%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
%endif
@ -78,7 +78,12 @@ License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and
Group: System/Filesystems
%endif
URL: http://ceph.com/
Source0: https://download.ceph.com/tarballs/ceph-13.0.0-3522-g2d444b010f.tar.bz2
Source0: ceph-%{version}.tar.bz2
Source96: checkin.sh
Source97: README-checkin.txt
Source98: README-ceph-test.txt
Source99: ceph-rpmlintrc
# _insert_obs_source_lines_here
%if 0%{?suse_version}
%if 0%{?is_opensuse}
ExclusiveArch: x86_64 aarch64 ppc64 ppc64le
@ -354,7 +359,7 @@ This package contains Ceph benchmarks and test tools.
%if 0%{?suse_version}
%endif
%prep
%autosetup -p1 -n ceph-13.0.0-3522-g2d444b010f
%autosetup -p1 -n ceph-13.0.0-3531-g9dbb709d3f
%build
%if 0%{with cephfs_java}
@ -529,7 +534,11 @@ rm -rf %{buildroot}%{_bindir}/monmaptool
rm -rf %{buildroot}%{_bindir}/osdmaptool
rm -rf %{buildroot}%{_bindir}/ceph-kvstore-tool
rm -rf %{buildroot}%{_bindir}/ceph-run
rm -rf %{buildroot}%{_bindir}/ceph-dencoder
rm -rf %{buildroot}%{_bindir}/ceph-detect-init
rm -rf %{buildroot}%{_bindir}/cephfs-data-scan
rm -rf %{buildroot}%{_bindir}/cephfs-journal-tool
rm -rf %{buildroot}%{_bindir}/cephfs-table-tool
rm -rf %{buildroot}%{_libexecdir}/systemd/system-preset/50-ceph.preset
rm -rf %{buildroot}%{_sbindir}/ceph-create-keys
rm -rf %{buildroot}%{_sbindir}/ceph-disk
@ -573,13 +582,9 @@ rm -rf %{buildroot}%{_docdir}/ceph/COPYING
rm -rf %{buildroot}%{_bindir}/ceph
rm -rf %{buildroot}%{_bindir}/ceph-authtool
rm -rf %{buildroot}%{_bindir}/ceph-conf
rm -rf %{buildroot}%{_bindir}/ceph-dencoder
rm -rf %{buildroot}%{_bindir}/ceph-rbdnamer
rm -rf %{buildroot}%{_bindir}/ceph-syn
rm -rf %{buildroot}%{_bindir}/ceph-crush-location
rm -rf %{buildroot}%{_bindir}/cephfs-data-scan
rm -rf %{buildroot}%{_bindir}/cephfs-journal-tool
rm -rf %{buildroot}%{_bindir}/cephfs-table-tool
rm -rf %{buildroot}%{_bindir}/rados
rm -rf %{buildroot}%{_bindir}/radosgw-admin
rm -rf %{buildroot}%{_bindir}/rbd
@ -908,3 +913,4 @@ rm -rf %{buildroot}
%if 0%{with selinux}
%endif # with selinux
%changelog
# nospeccleaner

2
ceph.changes
View File

@ -1,7 +1,7 @@
-------------------------------------------------------------------
Sat Nov 25 14:31:00 UTC 2017 - ncutler@suse.com
- Update to version 13.0.0-3522.g2d444b010f:
- Update to version 13.0.0-3531.g9dbb709d3f:
+ rebase to latest upstream master
+ Add "checkin.sh" script to automate the checkin process, along
with a "README-checkin.txt" file containing basic information.

27
ceph.spec
View File

@ -63,7 +63,7 @@
#################################################################################
Name: ceph
Version: 13.0.0
Release: 3522.g2d444b010f%{?dist}
Release: 3531.g9dbb709d3f%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
%endif
@ -78,7 +78,8 @@ License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and
Group: System/Filesystems
%endif
URL: http://ceph.com/
Source0: https://download.ceph.com/tarballs/ceph-13.0.0-3522-g2d444b010f.tar.bz2
Source0: %{name}-%{version}.tar.bz2
# _insert_obs_source_lines_here
%if 0%{?suse_version}
%if 0%{?is_opensuse}
ExclusiveArch: x86_64 aarch64 ppc64 ppc64le
@ -259,6 +260,8 @@ Requires: psmisc
Requires: which
%if 0%{?suse_version}
Recommends: ntp-daemon
Provides: libxio = 1.7
Obsoletes: libxio <= 1.7
%endif
%description base
Base is the package that includes all the files shared amongst ceph servers
@ -280,11 +283,14 @@ Requires: python-prettytable
%endif
%if 0%{?suse_version}
Requires: python-PrettyTable
Provides: libxio = 1.7
Obsoletes: libxio <= 1.7
%endif
Requires: python-requests
%{?systemd_requires}
%if 0%{?suse_version}
Requires(pre): pwdutils
PreReq: permissions
Requires(pre): shadow
%endif
%description -n ceph-common
Common utilities to mount and interact with a ceph storage cluster.
@ -781,7 +787,7 @@ python-rbd, python-rgw or python-cephfs instead.
# common
#################################################################################
%prep
%autosetup -p1 -n ceph-13.0.0-3522-g2d444b010f
%autosetup -p1 -n ceph-13.0.0-3531-g9dbb709d3f
%build
%if 0%{with cephfs_java}
@ -965,7 +971,11 @@ rm -rf %{buildroot}
%{_bindir}/osdmaptool
%{_bindir}/ceph-kvstore-tool
%{_bindir}/ceph-run
%{_bindir}/ceph-dencoder
%{_bindir}/ceph-detect-init
%{_bindir}/cephfs-data-scan
%{_bindir}/cephfs-journal-tool
%{_bindir}/cephfs-table-tool
%{_libexecdir}/systemd/system-preset/50-ceph.preset
%{_sbindir}/ceph-create-keys
%{_sbindir}/ceph-disk
@ -1077,13 +1087,9 @@ fi
%{_bindir}/ceph
%{_bindir}/ceph-authtool
%{_bindir}/ceph-conf
%{_bindir}/ceph-dencoder
%{_bindir}/ceph-rbdnamer
%{_bindir}/ceph-syn
%{_bindir}/ceph-crush-location
%{_bindir}/cephfs-data-scan
%{_bindir}/cephfs-journal-tool
%{_bindir}/cephfs-table-tool
%{_bindir}/rados
%{_bindir}/radosgw-admin
%{_bindir}/rbd
@ -1097,8 +1103,8 @@ fi
%if %{with lttng}
%{_bindir}/rbd-replay-prep
%endif
%{_bindir}/ceph-post-file
%{_bindir}/ceph-brag
%exclude %{_bindir}/ceph-post-file
%exclude %{_bindir}/ceph-brag
%{_tmpfilesdir}/ceph-common.conf
%{_mandir}/man8/ceph-authtool.8*
%{_mandir}/man8/ceph-conf.8*
@ -1796,3 +1802,4 @@ exit 0
%changelog
# nospeccleaner

3
pre_checkin.sh
View File

@ -287,5 +287,6 @@ reqs=`get_package_requires $SPEC_FILE $PACKAGE`
transform_spec_file $SPEC_FILE $PACKAGE "$rm_files" "$summ" "$desc" "$reqs" > $PACKAGE.spec
insert_line_before "${PACKAGE}.spec" "Source99: ceph-rpmlintrc" "_insert_obs_source_lines_here"
insert_line_before "${PACKAGE}.spec" "Source98: README-ceph-test.txt" "^Source99:"
insert_line_before "${PACKAGE}.spec" "Source97: ibs_constraints.sh" "^Source98:"
insert_line_before "${PACKAGE}.spec" "Source97: README-checkin.txt" "^Source98:"
insert_line_before "${PACKAGE}.spec" "Source96: checkin.sh" "^Source97:"
copy_changes_file $PACKAGE