From a3a81fd8d15140c74ac386b25693461cd5565f39c8396e4f56681396252afb2a Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Mon, 26 Jun 2017 07:31:36 +0000 Subject: [PATCH 1/3] Accepting request 506176 from filesystems:ceph:luminous 12.1.0 OBS-URL: https://build.opensuse.org/request/show/506176 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=99 --- _service | 4 +- ceph-12.0.3+git.1498202776.b806032985.tar.bz2 | 3 - ceph-12.1.0+git.1498309403.f4fc02fff4.tar.bz2 | 3 + ceph-test.changes | 10 ++++ ceph-test.spec | 15 +++-- ceph.changes | 10 ++++ ceph.spec | 58 ++++--------------- 7 files changed, 44 insertions(+), 59 deletions(-) delete mode 100644 ceph-12.0.3+git.1498202776.b806032985.tar.bz2 create mode 100644 ceph-12.1.0+git.1498309403.f4fc02fff4.tar.bz2 diff --git a/_service b/_service index 4ee148e..4164a80 100644 --- a/_service +++ b/_service @@ -1,12 +1,12 @@ - 12.0.3+git.%ct.%h + 12.1.0+git.%ct.%h git://github.com/SUSE/ceph.git ses5 ceph git no - enable + disable sh etc/ceph_ver_hack.sh diff --git a/ceph-12.0.3+git.1498202776.b806032985.tar.bz2 b/ceph-12.0.3+git.1498202776.b806032985.tar.bz2 deleted file mode 100644 index a4cdbcd..0000000 --- a/ceph-12.0.3+git.1498202776.b806032985.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:49f908485120588e0b85ed2281b423a12e30f5c552213c454f8f584cb4aaae67 -size 127011227 diff --git a/ceph-12.1.0+git.1498309403.f4fc02fff4.tar.bz2 b/ceph-12.1.0+git.1498309403.f4fc02fff4.tar.bz2 new file mode 100644 index 0000000..bba5a15 --- /dev/null +++ b/ceph-12.1.0+git.1498309403.f4fc02fff4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9df329b307b0bb0c1fadcfaf5c2f79a23139ef77acce94c3dad3ad041f52840 +size 126995522 diff --git a/ceph-test.changes b/ceph-test.changes index a07d509..593338f 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Jun 24 20:17:48 UTC 2017 - ncutler@suse.com + +- Update to version 12.1.0+git.1498309403.f4fc02fff4: + + upstream 12.1.0 release; for details, see + http://ceph.com/releases/v12-1-0-luminous-rc-released/ + + revert several pre-release commits that are no longer needed + because the issues have been fixed upstream in the meantime + + build/ops: rpm: sane packaging of %{_docdir}/ceph directory + ------------------------------------------------------------------- Fri Jun 23 08:11:22 UTC 2017 - ncutler@suse.com diff --git a/ceph-test.spec b/ceph-test.spec index 9b33be2..c4e3abc 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -69,7 +69,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 12.0.3+git.1498202776.b806032985 +Version: 12.1.0+git.1498309403.f4fc02fff4 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 1 @@ -129,7 +129,6 @@ BuildRequires: gperftools-devel >= 2.4 BuildRequires: jq BuildRequires: leveldb-devel > 1.2 BuildRequires: libaio-devel -BuildRequires: libatomic_ops-devel BuildRequires: libblkid-devel >= 2.17 BuildRequires: libcurl-devel BuildRequires: libudev-devel @@ -143,12 +142,15 @@ BuildRequires: procps BuildRequires: python BuildRequires: python-devel BuildRequires: python-nose +BuildRequires: python-pecan BuildRequires: python-requests BuildRequires: python-virtualenv +BuildRequires: python-werkzeug BuildRequires: snappy-devel BuildRequires: udev BuildRequires: util-linux BuildRequires: valgrind-devel +BuildRequires: which BuildRequires: xfsprogs BuildRequires: xfsprogs-devel BuildRequires: xmlstarlet @@ -503,7 +505,7 @@ install -m 0644 -D systemd/50-ceph.preset %{buildroot}%{_libexecdir}/systemd/sys mkdir -p %{buildroot}%{_sbindir} install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf -chmod 0644 %{buildroot}%{_docdir}/ceph/sample.fetch_config +install -m 0644 -D COPYING %{buildroot}%{_docdir}/ceph/COPYING # firewall templates and /sbin/mount.ceph symlink %if 0%{?suse_version} @@ -538,8 +540,6 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mgr %py3_compile %{buildroot}%{python3_sitelib} %endif -rm -rf %{buildroot}%{_docdir}/ceph/sample.ceph.conf -rm -rf %{buildroot}%{_docdir}/ceph/sample.fetch_config rm -rf %{buildroot}%{_bindir}/crushtool rm -rf %{buildroot}%{_bindir}/monmaptool rm -rf %{buildroot}%{_bindir}/osdmaptool @@ -577,6 +577,10 @@ rm -rf %{buildroot}%{_mandir}/man8/ceph-run.8* rm -rf %{buildroot}%{_mandir}/man8/crushtool.8* rm -rf %{buildroot}%{_mandir}/man8/osdmaptool.8* rm -rf %{buildroot}%{_mandir}/man8/monmaptool.8* +rm -rf %{buildroot}%doc +rm -rf %{buildroot}%{_docdir}/ceph/sample.ceph.conf +rm -rf %{buildroot}%doc +rm -rf %{buildroot}%{_docdir}/ceph/COPYING rm -rf %{buildroot}%{_bindir}/ceph rm -rf %{buildroot}%{_bindir}/ceph-authtool rm -rf %{buildroot}%{_bindir}/ceph-conf @@ -868,7 +872,6 @@ rm -rf %{buildroot} %endif %if 0%{with ceph_test_package} %files -n ceph-test -%defattr(-,root,root,-) %{_bindir}/ceph-client-debug %{_bindir}/ceph_bench_log %{_bindir}/ceph_kvstorebench diff --git a/ceph.changes b/ceph.changes index a07d509..593338f 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Jun 24 20:17:48 UTC 2017 - ncutler@suse.com + +- Update to version 12.1.0+git.1498309403.f4fc02fff4: + + upstream 12.1.0 release; for details, see + http://ceph.com/releases/v12-1-0-luminous-rc-released/ + + revert several pre-release commits that are no longer needed + because the issues have been fixed upstream in the meantime + + build/ops: rpm: sane packaging of %{_docdir}/ceph directory + ------------------------------------------------------------------- Fri Jun 23 08:11:22 UTC 2017 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index 252fb4d..f5b3360 100644 --- a/ceph.spec +++ b/ceph.spec @@ -69,7 +69,7 @@ # main package definition ################################################################################# Name: ceph -Version: 12.0.3+git.1498202776.b806032985 +Version: 12.1.0+git.1498309403.f4fc02fff4 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 1 @@ -123,7 +123,6 @@ BuildRequires: gperftools-devel >= 2.4 BuildRequires: jq BuildRequires: leveldb-devel > 1.2 BuildRequires: libaio-devel -BuildRequires: libatomic_ops-devel BuildRequires: libblkid-devel >= 2.17 BuildRequires: libcurl-devel BuildRequires: libudev-devel @@ -137,12 +136,15 @@ BuildRequires: procps BuildRequires: python BuildRequires: python-devel BuildRequires: python-nose +BuildRequires: python-pecan BuildRequires: python-requests BuildRequires: python-virtualenv +BuildRequires: python-werkzeug BuildRequires: snappy-devel BuildRequires: udev BuildRequires: util-linux BuildRequires: valgrind-devel +BuildRequires: which BuildRequires: xfsprogs BuildRequires: xfsprogs-devel BuildRequires: xmlstarlet @@ -333,13 +335,14 @@ Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} Requires: python-cherrypy Requires: python-werkzeug +Requires: pyOpenSSL %endif %if 0%{?suse_version} Requires: python-CherryPy Requires: python-Werkzeug +Requires: python-pyOpenSSL %endif Requires: python-pecan -Requires(post): openssl %description mgr ceph-mgr enables python modules that provide services (such as the REST module derived from Calamari) and expose CLI hooks. ceph-mgr gathers @@ -926,7 +929,7 @@ install -m 0644 -D systemd/50-ceph.preset %{buildroot}%{_libexecdir}/systemd/sys mkdir -p %{buildroot}%{_sbindir} install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf -chmod 0644 %{buildroot}%{_docdir}/ceph/sample.fetch_config +install -m 0644 -D COPYING %{buildroot}%{_docdir}/ceph/COPYING # firewall templates and /sbin/mount.ceph symlink %if 0%{?suse_version} @@ -970,11 +973,6 @@ rm -rf %{buildroot} %files %files base -%defattr(-,root,root,-) -%docdir %{_docdir} -%dir %{_docdir}/ceph -%{_docdir}/ceph/sample.ceph.conf -%{_docdir}/ceph/sample.fetch_config %{_bindir}/crushtool %{_bindir}/monmaptool %{_bindir}/osdmaptool @@ -1078,7 +1076,9 @@ if [ $FIRST_ARG -ge 1 ] ; then fi %files common -%defattr(-,root,root,-) +%dir %{_docdir}/ceph +%doc %{_docdir}/ceph/sample.ceph.conf +%doc %{_docdir}/ceph/COPYING %{_bindir}/ceph %{_bindir}/ceph-authtool %{_bindir}/ceph-conf @@ -1227,13 +1227,6 @@ fi %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mgr %post mgr -CERT="%{_sysconfdir}/ceph/ceph-mgr-restful.crt" -PKEY="%{_sysconfdir}/ceph/ceph-mgr-restful.key" -if [ ! -e "$CERT" -o ! -e "$PKEY" ]; then - openssl req -new -nodes -x509 \ - -subj "/O=IT/CN=ceph-mgr-restful" \ - -days 3650 -keyout "$PKEY" -out "$CERT" -extensions v3_ca -fi %if 0%{?suse_version} if [ $1 -eq 1 ] ; then /usr/bin/systemctl preset ceph-mgr@\*.service ceph-mgr.target >/dev/null 2>&1 || : @@ -1328,7 +1321,6 @@ if [ $FIRST_ARG -ge 1 ] ; then fi %files fuse -%defattr(-,root,root,-) %{_bindir}/ceph-fuse %{_mandir}/man8/ceph-fuse.8* %{_sbindir}/mount.fuse.ceph @@ -1336,12 +1328,10 @@ fi %{_unitdir}/ceph-fuse.target %files -n rbd-fuse -%defattr(-,root,root,-) %{_bindir}/rbd-fuse %{_mandir}/man8/rbd-fuse.8* %files -n rbd-mirror -%defattr(-,root,root,-) %{_bindir}/rbd-mirror %{_mandir}/man8/rbd-mirror.8* %{_unitdir}/ceph-rbd-mirror@.service @@ -1390,12 +1380,10 @@ if [ $FIRST_ARG -ge 1 ] ; then fi %files -n rbd-nbd -%defattr(-,root,root,-) %{_bindir}/rbd-nbd %{_mandir}/man8/rbd-nbd.8* %files radosgw -%defattr(-,root,root,-) %{_bindir}/radosgw %{_bindir}/radosgw-token %{_bindir}/radosgw-es @@ -1510,7 +1498,6 @@ fi %if %{with ocf} %files resource-agents -%defattr(0755,root,root,-) %dir %{_prefix}/lib/ocf %dir %{_prefix}/lib/ocf/resource.d %dir %{_prefix}/lib/ocf/resource.d/ceph @@ -1519,7 +1506,6 @@ fi %endif %files -n librados2 -%defattr(-,root,root,-) %{_libdir}/librados.so.* %dir %{_libdir}/ceph %{_libdir}/ceph/libceph-common.so* @@ -1532,7 +1518,6 @@ fi %postun -n librados2 -p /sbin/ldconfig %files -n librados-devel -%defattr(-,root,root,-) %dir %{_includedir}/rados %{_includedir}/rados/librados.h %{_includedir}/rados/librados.hpp @@ -1552,17 +1537,14 @@ fi %{_mandir}/man8/librados-config.8* %files -n python-rados -%defattr(-,root,root,-) %{python_sitearch}/rados.so %{python_sitearch}/rados-*.egg-info %files -n python%{python3_pkgversion}-rados -%defattr(-,root,root,-) %{python3_sitearch}/rados.cpython*.so %{python3_sitearch}/rados-*.egg-info %files -n libradosstriper1 -%defattr(-,root,root,-) %{_libdir}/libradosstriper.so.* %post -n libradosstriper1 -p /sbin/ldconfig @@ -1570,14 +1552,12 @@ fi %postun -n libradosstriper1 -p /sbin/ldconfig %files -n libradosstriper-devel -%defattr(-,root,root,-) %dir %{_includedir}/radosstriper %{_includedir}/radosstriper/libradosstriper.h %{_includedir}/radosstriper/libradosstriper.hpp %{_libdir}/libradosstriper.so %files -n librbd1 -%defattr(-,root,root,-) %{_libdir}/librbd.so.* %if %{with lttng} %{_libdir}/librbd_tp.so.* @@ -1591,7 +1571,6 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1 %postun -n librbd1 -p /sbin/ldconfig %files -n librbd-devel -%defattr(-,root,root,-) %dir %{_includedir}/rbd %{_includedir}/rbd/librbd.h %{_includedir}/rbd/librbd.hpp @@ -1602,7 +1581,6 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1 %endif %files -n librgw2 -%defattr(-,root,root,-) %{_libdir}/librgw.so.* %post -n librgw2 -p /sbin/ldconfig @@ -1610,34 +1588,28 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1 %postun -n librgw2 -p /sbin/ldconfig %files -n librgw-devel -%defattr(-,root,root,-) %dir %{_includedir}/rados %{_includedir}/rados/librgw.h %{_includedir}/rados/rgw_file.h %{_libdir}/librgw.so %files -n python-rgw -%defattr(-,root,root,-) %{python_sitearch}/rgw.so %{python_sitearch}/rgw-*.egg-info %files -n python%{python3_pkgversion}-rgw -%defattr(-,root,root,-) %{python3_sitearch}/rgw.cpython*.so %{python3_sitearch}/rgw-*.egg-info %files -n python-rbd -%defattr(-,root,root,-) %{python_sitearch}/rbd.so %{python_sitearch}/rbd-*.egg-info %files -n python%{python3_pkgversion}-rbd -%defattr(-,root,root,-) %{python3_sitearch}/rbd.cpython*.so %{python3_sitearch}/rbd-*.egg-info %files -n libcephfs2 -%defattr(-,root,root,-) %{_libdir}/libcephfs.so.* %post -n libcephfs2 -p /sbin/ldconfig @@ -1645,27 +1617,23 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1 %postun -n libcephfs2 -p /sbin/ldconfig %files -n libcephfs-devel -%defattr(-,root,root,-) %dir %{_includedir}/cephfs %{_includedir}/cephfs/libcephfs.h %{_includedir}/cephfs/ceph_statx.h %{_libdir}/libcephfs.so %files -n python-cephfs -%defattr(-,root,root,-) %{python_sitearch}/cephfs.so %{python_sitearch}/cephfs-*.egg-info %{python_sitelib}/ceph_volume_client.py* %files -n python%{python3_pkgversion}-cephfs -%defattr(-,root,root,-) %{python3_sitearch}/cephfs.cpython*.so %{python3_sitearch}/cephfs-*.egg-info %{python3_sitelib}/ceph_volume_client.py %{python3_sitelib}/__pycache__/ceph_volume_client.cpython*.py* %files -n python%{python3_pkgversion}-ceph-argparse -%defattr(-,root,root,-) %{python3_sitelib}/ceph_argparse.py %{python3_sitelib}/__pycache__/ceph_argparse.cpython*.py* %{python3_sitelib}/ceph_daemon.py @@ -1673,7 +1641,6 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1 %if 0%{with ceph_test_package} %files -n ceph-test -%defattr(-,root,root,-) %{_bindir}/ceph-client-debug %{_bindir}/ceph_bench_log %{_bindir}/ceph_kvstorebench @@ -1711,7 +1678,6 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1 %if 0%{with cephfs_java} %files -n libcephfs_jni1 -%defattr(-,root,root,-) %{_libdir}/libcephfs_jni.so.* %post -n libcephfs_jni1 -p /sbin/ldconfig @@ -1719,23 +1685,19 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1 %postun -n libcephfs_jni1 -p /sbin/ldconfig %files -n libcephfs_jni-devel -%defattr(-,root,root,-) %{_libdir}/libcephfs_jni.so %files -n cephfs-java -%defattr(-,root,root,-) %{_javadir}/libcephfs.jar %{_javadir}/libcephfs-test.jar %endif %files -n rados-objclass-devel -%defattr(-,root,root,-) %dir %{_includedir}/rados %{_includedir}/rados/objclass.h %if 0%{with selinux} %files selinux -%defattr(-,root,root,-) %attr(0600,root,root) %{_datadir}/selinux/packages/ceph.pp %{_datadir}/selinux/devel/include/contrib/ceph.if %{_mandir}/man8/ceph_selinux.8* From 7e197136ce8a8577c4be4c47eba16034fc8629c73f726d6be5be473297e69ee3 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Mon, 26 Jun 2017 12:41:31 +0000 Subject: [PATCH 2/3] Accepting request 506251 from filesystems:ceph:luminous make ceph --version happy OBS-URL: https://build.opensuse.org/request/show/506251 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=100 --- _service | 2 +- _servicedata | 2 +- ceph-12.1.0+git.1498309403.f4fc02fff4.tar.bz2 | 3 --- ceph-12.1.0+git.1498478524.117b171715.tar.bz2 | 3 +++ ceph-test.changes | 7 +++++++ ceph-test.spec | 2 +- ceph.changes | 7 +++++++ ceph.spec | 2 +- 8 files changed, 21 insertions(+), 7 deletions(-) delete mode 100644 ceph-12.1.0+git.1498309403.f4fc02fff4.tar.bz2 create mode 100644 ceph-12.1.0+git.1498478524.117b171715.tar.bz2 diff --git a/_service b/_service index 4164a80..e57f411 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 78af4c4..1243fad 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/SUSE/ceph.git - b806032985d029d5ae667099b1a050e07516a96e \ No newline at end of file + 117b1717154e1236b2d37c405a86a9444cf7871d \ No newline at end of file diff --git a/ceph-12.1.0+git.1498309403.f4fc02fff4.tar.bz2 b/ceph-12.1.0+git.1498309403.f4fc02fff4.tar.bz2 deleted file mode 100644 index bba5a15..0000000 --- a/ceph-12.1.0+git.1498309403.f4fc02fff4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f9df329b307b0bb0c1fadcfaf5c2f79a23139ef77acce94c3dad3ad041f52840 -size 126995522 diff --git a/ceph-12.1.0+git.1498478524.117b171715.tar.bz2 b/ceph-12.1.0+git.1498478524.117b171715.tar.bz2 new file mode 100644 index 0000000..973e410 --- /dev/null +++ b/ceph-12.1.0+git.1498478524.117b171715.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b381effb1627c7423b7b069537857ba06c10fc389c25464e01e076151d6f085 +size 126993687 diff --git a/ceph-test.changes b/ceph-test.changes index 593338f..0b31f59 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 26 12:25:57 UTC 2017 - ncutler@suse.com + +- Update to version 12.1.0+git.1498478524.117b171715: + + include 12.1.0 tag to make "ceph --version" happy + + tests: drop hadoop-s3a tests + ------------------------------------------------------------------- Sat Jun 24 20:17:48 UTC 2017 - ncutler@suse.com diff --git a/ceph-test.spec b/ceph-test.spec index c4e3abc..d821c86 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -69,7 +69,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 12.1.0+git.1498309403.f4fc02fff4 +Version: 12.1.0+git.1498478524.117b171715 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 1 diff --git a/ceph.changes b/ceph.changes index 593338f..0b31f59 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 26 12:25:57 UTC 2017 - ncutler@suse.com + +- Update to version 12.1.0+git.1498478524.117b171715: + + include 12.1.0 tag to make "ceph --version" happy + + tests: drop hadoop-s3a tests + ------------------------------------------------------------------- Sat Jun 24 20:17:48 UTC 2017 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index f5b3360..e30f312 100644 --- a/ceph.spec +++ b/ceph.spec @@ -69,7 +69,7 @@ # main package definition ################################################################################# Name: ceph -Version: 12.1.0+git.1498309403.f4fc02fff4 +Version: 12.1.0+git.1498478524.117b171715 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 1 From 7aad8c0fadc46a0bcafbab4d5ef0f3d9291cec10adb7cdfe74b85ee3cfe37a8c Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Wed, 28 Jun 2017 18:01:43 +0000 Subject: [PATCH 3/3] Accepting request 506875 from filesystems:ceph:luminous Eliminate several python build deps OBS-URL: https://build.opensuse.org/request/show/506875 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=101 --- _servicedata | 2 +- ceph-12.1.0+git.1498478524.117b171715.tar.bz2 | 3 --- ceph-12.1.0+git.1498654198.20d6a47cc9.tar.bz2 | 3 +++ ceph-test.changes | 19 +++++++++++++++++++ ceph-test.spec | 17 ++++++++++++----- ceph.changes | 19 +++++++++++++++++++ ceph.spec | 17 ++++++++++++----- 7 files changed, 66 insertions(+), 14 deletions(-) delete mode 100644 ceph-12.1.0+git.1498478524.117b171715.tar.bz2 create mode 100644 ceph-12.1.0+git.1498654198.20d6a47cc9.tar.bz2 diff --git a/_servicedata b/_servicedata index 1243fad..a4f5417 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/SUSE/ceph.git - 117b1717154e1236b2d37c405a86a9444cf7871d \ No newline at end of file + 20d6a47cc9a08e4013d0492381d62b60f48eed47 \ No newline at end of file diff --git a/ceph-12.1.0+git.1498478524.117b171715.tar.bz2 b/ceph-12.1.0+git.1498478524.117b171715.tar.bz2 deleted file mode 100644 index 973e410..0000000 --- a/ceph-12.1.0+git.1498478524.117b171715.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7b381effb1627c7423b7b069537857ba06c10fc389c25464e01e076151d6f085 -size 126993687 diff --git a/ceph-12.1.0+git.1498654198.20d6a47cc9.tar.bz2 b/ceph-12.1.0+git.1498654198.20d6a47cc9.tar.bz2 new file mode 100644 index 0000000..d3b99f9 --- /dev/null +++ b/ceph-12.1.0+git.1498654198.20d6a47cc9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d74538a704616616e85d9ef7a89c36f5f25aff80248ed1e4ea8307b69e0cbb9 +size 126993807 diff --git a/ceph-test.changes b/ceph-test.changes index 0b31f59..a81ac0d 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Wed Jun 28 13:33:48 UTC 2017 - ncutler@suse.com + +- Update to version 12.1.0+git.1498654198.20d6a47cc9: + + build/ops: rpm: put mgr python build dependencies in make_check bcond + N.B. this effectively eliminates the following build dependencies: + python-Babel python-beautifulsoup4 python-CherryPy python-coverage + python-flup python-Genshi python-html5lib python-logutils python-nose + python-Paste python-PasteDeploy python-PasteDeploy python-pecan + python-pyquery python-singledispatch python-waitress python-WebOb + python-WebTest python-Werkzeug python-WSGIProxy2 pytyhon-python-openid + +------------------------------------------------------------------- +Mon Jun 26 13:52:31 UTC 2017 - ncutler@suse.com + +- spec file: + + removed BR libatomic_ops-devel as upstream replaced it with std:atomic + + removed defattr as they are no longer needed on sle12 and newer + ------------------------------------------------------------------- Mon Jun 26 12:25:57 UTC 2017 - ncutler@suse.com diff --git a/ceph-test.spec b/ceph-test.spec index d821c86..369b4e3 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -69,7 +69,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 12.1.0+git.1498478524.117b171715 +Version: 12.1.0+git.1498654198.20d6a47cc9 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 1 @@ -116,6 +116,17 @@ BuildRequires: checkpolicy BuildRequires: selinux-policy-devel BuildRequires: /usr/share/selinux/devel/policyhelp %endif +%if 0%{with make_check} +%if 0%{?fedora} || 0%{?rhel} +BuildRequires: python-cherrypy +BuildRequires: python-werkzeug +%endif +%if 0%{?suse_version} +BuildRequires: python-CherryPy +BuildRequires: python-Werkzeug +%endif +BuildRequires: python-pecan +%endif BuildRequires: bc BuildRequires: gperf BuildRequires: cmake @@ -142,10 +153,8 @@ BuildRequires: procps BuildRequires: python BuildRequires: python-devel BuildRequires: python-nose -BuildRequires: python-pecan BuildRequires: python-requests BuildRequires: python-virtualenv -BuildRequires: python-werkzeug BuildRequires: snappy-devel BuildRequires: udev BuildRequires: util-linux @@ -173,7 +182,6 @@ BuildRequires: keyutils-devel BuildRequires: libopenssl-devel BuildRequires: lsb-release BuildRequires: openldap2-devel -BuildRequires: python-CherryPy BuildRequires: python-Cython BuildRequires: python-PrettyTable BuildRequires: python-Sphinx @@ -190,7 +198,6 @@ BuildRequires: openldap-devel BuildRequires: openssl-devel BuildRequires: redhat-lsb-core BuildRequires: Cython -BuildRequires: python-cherrypy BuildRequires: python-prettytable BuildRequires: python-sphinx %endif diff --git a/ceph.changes b/ceph.changes index 0b31f59..a81ac0d 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Wed Jun 28 13:33:48 UTC 2017 - ncutler@suse.com + +- Update to version 12.1.0+git.1498654198.20d6a47cc9: + + build/ops: rpm: put mgr python build dependencies in make_check bcond + N.B. this effectively eliminates the following build dependencies: + python-Babel python-beautifulsoup4 python-CherryPy python-coverage + python-flup python-Genshi python-html5lib python-logutils python-nose + python-Paste python-PasteDeploy python-PasteDeploy python-pecan + python-pyquery python-singledispatch python-waitress python-WebOb + python-WebTest python-Werkzeug python-WSGIProxy2 pytyhon-python-openid + +------------------------------------------------------------------- +Mon Jun 26 13:52:31 UTC 2017 - ncutler@suse.com + +- spec file: + + removed BR libatomic_ops-devel as upstream replaced it with std:atomic + + removed defattr as they are no longer needed on sle12 and newer + ------------------------------------------------------------------- Mon Jun 26 12:25:57 UTC 2017 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index e30f312..911a40f 100644 --- a/ceph.spec +++ b/ceph.spec @@ -69,7 +69,7 @@ # main package definition ################################################################################# Name: ceph -Version: 12.1.0+git.1498478524.117b171715 +Version: 12.1.0+git.1498654198.20d6a47cc9 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 1 @@ -110,6 +110,17 @@ BuildRequires: checkpolicy BuildRequires: selinux-policy-devel BuildRequires: /usr/share/selinux/devel/policyhelp %endif +%if 0%{with make_check} +%if 0%{?fedora} || 0%{?rhel} +BuildRequires: python-cherrypy +BuildRequires: python-werkzeug +%endif +%if 0%{?suse_version} +BuildRequires: python-CherryPy +BuildRequires: python-Werkzeug +%endif +BuildRequires: python-pecan +%endif BuildRequires: bc BuildRequires: gperf BuildRequires: cmake @@ -136,10 +147,8 @@ BuildRequires: procps BuildRequires: python BuildRequires: python-devel BuildRequires: python-nose -BuildRequires: python-pecan BuildRequires: python-requests BuildRequires: python-virtualenv -BuildRequires: python-werkzeug BuildRequires: snappy-devel BuildRequires: udev BuildRequires: util-linux @@ -167,7 +176,6 @@ BuildRequires: keyutils-devel BuildRequires: libopenssl-devel BuildRequires: lsb-release BuildRequires: openldap2-devel -BuildRequires: python-CherryPy BuildRequires: python-Cython BuildRequires: python-PrettyTable BuildRequires: python-Sphinx @@ -184,7 +192,6 @@ BuildRequires: openldap-devel BuildRequires: openssl-devel BuildRequires: redhat-lsb-core BuildRequires: Cython -BuildRequires: python-cherrypy BuildRequires: python-prettytable BuildRequires: python-sphinx %endif