From 7aad8c0fadc46a0bcafbab4d5ef0f3d9291cec10adb7cdfe74b85ee3cfe37a8c Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Wed, 28 Jun 2017 18:01:43 +0000 Subject: [PATCH] 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