diff --git a/_servicedata b/_servicedata index fb8ad05..506acb9 100644 --- a/_servicedata +++ b/_servicedata @@ -1,5 +1,5 @@ git://github.com/SUSE/ceph.git - b9decd3bcb1cb21f61955c0666d963908fa70e97 + 9e76375af61a4b82de56d4b751e20787197bd654 \ No newline at end of file diff --git a/ceph-10.2.1+git.1465763247.b9decd3.tar.bz2 b/ceph-10.2.1+git.1465763247.b9decd3.tar.bz2 deleted file mode 100644 index b43b23a..0000000 --- a/ceph-10.2.1+git.1465763247.b9decd3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b2aeb52e4533931a3451dbf8d2438a3d21cd0d5ccbc4486a447e8b3ba5a7bd51 -size 16459056 diff --git a/ceph-10.2.1+git.1465795427.9e76375.tar.bz2 b/ceph-10.2.1+git.1465795427.9e76375.tar.bz2 new file mode 100644 index 0000000..0b6955d --- /dev/null +++ b/ceph-10.2.1+git.1465795427.9e76375.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93db72d9fe69f4d8c665fd3c831ba38216b1852a99553e858f1fbdc2290c6321 +size 16500420 diff --git a/ceph.changes b/ceph.changes index 3aea9ab..36375de 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 13 05:28:43 UTC 2016 - ncutler@suse.com + +- Update to version 10.2.1+git.1465795427.9e76375: + + rpm: divergent java, ocf conditional builds + ------------------------------------------------------------------- Sun Jun 12 20:46:50 UTC 2016 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index 06cd296..748d391 100644 --- a/ceph.spec +++ b/ceph.spec @@ -13,8 +13,6 @@ # # Please submit bugfixes or comments via http://tracker.ceph.com/ # -%bcond_with ocf -%bcond_without cephfs_java %bcond_with tests %bcond_with xio %bcond_without tcmalloc @@ -22,9 +20,13 @@ %bcond_with lowmem_builder %bcond_with minimal_debugging_information %if 0%{?fedora} || 0%{?rhel} +%bcond_without cephfs_java +%bcond_with ocf %bcond_without selinux %endif %if 0%{?suse_version} +%bcond_with cephfs_java +%bcond_without ocf %bcond_with selinux %endif @@ -49,8 +51,8 @@ # common ################################################################################# Name: ceph -Version: 10.2.1+git.1465763247.b9decd3 -Release: 0%{?dist} +Version: 10.2.1+git.1465795427.9e76375 +Release: 0 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 and BSD-3-Clause and MIT %if 0%{?suse_version}