Accepting request 613242 from filesystems:ceph:nautilus

- Update to 14.0.0-123-g83acfb8fb6:
  + based on upstream master f21df7672d4db80acaf782383ccaf474261d5886
    * fix GCC8 builds (bsc#1084645)
    * fix python3 module loading (bsc#1086613)

OBS-URL: https://build.opensuse.org/request/show/613242
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=186
This commit is contained in:
Tim Serong 2018-05-31 10:41:42 +00:00 committed by Git OBS Bridge
parent 2342fa1dd2
commit 5cdf728ea9
6 changed files with 31 additions and 13 deletions

View File

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

View File

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

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed May 30 13:09:12 UTC 2018 - jan.fajerski@suse.com
- Update to 14.0.0-123-g83acfb8fb6:
+ based on upstream master f21df7672d4db80acaf782383ccaf474261d5886
* fix GCC8 builds (bsc#1084645)
* fix python3 module loading (bsc#1086613)
-------------------------------------------------------------------
Thu Apr 26 21:27:17 UTC 2018 - ncutler@suse.com

View File

@ -76,7 +76,7 @@
# main package definition
#################################################################################
Name: ceph-test
Version: 13.0.2.1874+ge31585919b
Version: 14.0.0.123+g83acfb8fb6
Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
@ -92,7 +92,7 @@ License: LGPL-2.1 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and
Group: System/Filesystems
%endif
URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-13.0.2-1874-ge31585919b.tar.bz2
Source0: %{?_remote_tarball_prefix}ceph-14.0.0-123-g83acfb8fb6.tar.bz2
%if 0%{?suse_version}
Source96: checkin.sh
Source97: README-checkin.txt
@ -411,7 +411,7 @@ This package contains Ceph benchmarks and test tools.
%endif
%endif
%prep
%autosetup -p1 -n ceph-13.0.2-1874-ge31585919b
%autosetup -p1 -n ceph-14.0.0-123-g83acfb8fb6
%build
@ -430,7 +430,6 @@ done
# the following setting fixed an OOM condition we once encountered in the OBS
RPM_OPT_FLAGS="$RPM_OPT_FLAGS --param ggc-min-expand=20 --param ggc-min-heapsize=32768"
%endif
export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
export CPPFLAGS="$java_inc"
export CFLAGS="$RPM_OPT_FLAGS"
@ -471,7 +470,6 @@ cmake .. \
-DCMAKE_INSTALL_MANDIR=%{_mandir} \
-DCMAKE_INSTALL_DOCDIR=%{_docdir}/ceph \
-DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
-DWITH_EMBEDDED=OFF \
-DWITH_MANPAGE=ON \
-DWITH_PYTHON3=ON \
-DWITH_MGR_DASHBOARD_FRONTEND=OFF \
@ -760,11 +758,14 @@ rm -rf %{buildroot}%{_includedir}/rbd/features.h
rm -rf %{buildroot}%{_libdir}/librbd.so
rm -rf %{buildroot}%{_libdir}/librbd_tp.so
rm -rf %{buildroot}%{_libdir}/librgw.so.*
rm -rf %{buildroot}%{_libdir}/librgw_admin_user.so.*
rm -rf %{buildroot}%{_libdir}/librgw_op_tp.so*
rm -rf %{buildroot}%{_libdir}/librgw_rados_tp.so*
rm -rf %{buildroot}%{_includedir}/rados/librgw.h
rm -rf %{buildroot}%{_includedir}/rados/librgw_admin_user.h
rm -rf %{buildroot}%{_includedir}/rados/rgw_file.h
rm -rf %{buildroot}%{_libdir}/librgw.so
rm -rf %{buildroot}%{_libdir}/librgw_admin_user.so
rm -rf %{buildroot}%{python_sitearch}/rgw.so
rm -rf %{buildroot}%{python_sitearch}/rgw-*.egg-info
rm -rf %{buildroot}%{python3_sitearch}/rgw.cpython*.so

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed May 30 13:09:12 UTC 2018 - jan.fajerski@suse.com
- Update to 14.0.0-123-g83acfb8fb6:
+ based on upstream master f21df7672d4db80acaf782383ccaf474261d5886
* fix GCC8 builds (bsc#1084645)
* fix python3 module loading (bsc#1086613)
-------------------------------------------------------------------
Thu Apr 26 21:27:17 UTC 2018 - ncutler@suse.com

View File

@ -76,7 +76,7 @@
# main package definition
#################################################################################
Name: ceph
Version: 13.0.2.1874+ge31585919b
Version: 14.0.0.123+g83acfb8fb6
Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
@ -92,7 +92,7 @@ License: LGPL-2.1 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and
Group: System/Filesystems
%endif
URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-13.0.2-1874-ge31585919b.tar.bz2
Source0: %{?_remote_tarball_prefix}ceph-14.0.0-123-g83acfb8fb6.tar.bz2
%if 0%{?suse_version}
# _insert_obs_source_lines_here
%if 0%{?is_opensuse}
@ -845,7 +845,7 @@ python-rbd, python-rgw or python-cephfs instead.
# common
#################################################################################
%prep
%autosetup -p1 -n ceph-13.0.2-1874-ge31585919b
%autosetup -p1 -n ceph-14.0.0-123-g83acfb8fb6
%build
@ -864,7 +864,6 @@ done
# the following setting fixed an OOM condition we once encountered in the OBS
RPM_OPT_FLAGS="$RPM_OPT_FLAGS --param ggc-min-expand=20 --param ggc-min-heapsize=32768"
%endif
export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
export CPPFLAGS="$java_inc"
export CFLAGS="$RPM_OPT_FLAGS"
@ -905,7 +904,6 @@ cmake .. \
-DCMAKE_INSTALL_MANDIR=%{_mandir} \
-DCMAKE_INSTALL_DOCDIR=%{_docdir}/ceph \
-DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
-DWITH_EMBEDDED=OFF \
-DWITH_MANPAGE=ON \
-DWITH_PYTHON3=ON \
-DWITH_MGR_DASHBOARD_FRONTEND=OFF \
@ -1662,6 +1660,7 @@ fi
%files -n librgw2
%{_libdir}/librgw.so.*
%{_libdir}/librgw_admin_user.so.*
%if %{with lttng}
%{_libdir}/librgw_op_tp.so*
%{_libdir}/librgw_rados_tp.so*
@ -1674,8 +1673,10 @@ fi
%files -n librgw-devel
%dir %{_includedir}/rados
%{_includedir}/rados/librgw.h
%{_includedir}/rados/librgw_admin_user.h
%{_includedir}/rados/rgw_file.h
%{_libdir}/librgw.so
%{_libdir}/librgw_admin_user.so
%if 0%{with python2}
%files -n python-rgw