From b88d6bbf9b9e9b047a649a0d6943cf92dcfa1e528447927ba0b11123ee520ce2 Mon Sep 17 00:00:00 2001
From: Nathan Cutler <ncutler@suse.com>
Date: Fri, 4 Aug 2017 20:25:35 +0000
Subject: [PATCH] Accepting request 514610 from filesystems:ceph:luminous

fix ceph-volume packaging

OBS-URL: https://build.opensuse.org/request/show/514610
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=117
---
 _service                                      | 2 +-
 _servicedata                                  | 2 +-
 ceph-12.1.2+git.1501865907.88dc8cdc9d.tar.bz2 | 3 ---
 ceph-12.1.2+git.1501876501.4c219a30d6.tar.bz2 | 3 +++
 ceph-test.changes                             | 7 +++++++
 ceph-test.spec                                | 5 +++--
 ceph.changes                                  | 7 +++++++
 ceph.spec                                     | 5 +++--
 8 files changed, 25 insertions(+), 9 deletions(-)
 delete mode 100644 ceph-12.1.2+git.1501865907.88dc8cdc9d.tar.bz2
 create mode 100644 ceph-12.1.2+git.1501876501.4c219a30d6.tar.bz2

diff --git a/_service b/_service
index dbc6d4f..13f3da3 100644
--- a/_service
+++ b/_service
@@ -6,7 +6,7 @@
     <param name="filename">ceph</param>
     <param name="scm">git</param>
     <param name="package-meta">no</param>
-    <param name="changesgenerate">disable</param>
+    <param name="changesgenerate">enable</param>
     <param name="commandtorun">sh etc/ceph_ver_hack.sh</param>
   </service>
   <service name="extract_ceph_spec" mode="disabled" />
diff --git a/_servicedata b/_servicedata
index 5883481..4464595 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
             <param name="url">git://github.com/SUSE/ceph.git</param>
-          <param name="changesrevision">82d6a9c37ad0a5229f5b4e6d8046eaea6cc5f318</param></service></servicedata>
\ No newline at end of file
+          <param name="changesrevision">4c219a30d65ea2e72afd41dc65fd1dedd1da0b26</param></service></servicedata>
\ No newline at end of file
diff --git a/ceph-12.1.2+git.1501865907.88dc8cdc9d.tar.bz2 b/ceph-12.1.2+git.1501865907.88dc8cdc9d.tar.bz2
deleted file mode 100644
index dc3ed51..0000000
--- a/ceph-12.1.2+git.1501865907.88dc8cdc9d.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:320679b70a5cbd85669554bce5e7c8b6fcb26d66345e25c68a4be26147e6ba0b
-size 127311258
diff --git a/ceph-12.1.2+git.1501876501.4c219a30d6.tar.bz2 b/ceph-12.1.2+git.1501876501.4c219a30d6.tar.bz2
new file mode 100644
index 0000000..fe0ec5b
--- /dev/null
+++ b/ceph-12.1.2+git.1501876501.4c219a30d6.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:117ae51d20e3fe9cf1340b85c2bf4d809421bae11bd579755631ec3462b028a9
+size 127310853
diff --git a/ceph-test.changes b/ceph-test.changes
index eeb9e04..bea2717 100644
--- a/ceph-test.changes
+++ b/ceph-test.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Aug 04 20:16:27 UTC 2017 - ncutler@suse.com
+
+- Update to version 12.1.2+git.1501876501.4c219a30d6:
+  + debian: include ceph-volume python
+  + ceph.spec.in: ceph_volume but not ceph_volume_client in ceph-base
+
 -------------------------------------------------------------------
 Fri Aug  4 16:59:59 UTC 2017 - ncutler@suse.com
 
diff --git a/ceph-test.spec b/ceph-test.spec
index 162818e..f92d2b3 100644
--- a/ceph-test.spec
+++ b/ceph-test.spec
@@ -68,7 +68,7 @@
 # main package definition
 #################################################################################
 Name: ceph-test
-Version: 12.1.2+git.1501865907.88dc8cdc9d
+Version: 12.1.2+git.1501876501.4c219a30d6
 Release: 0%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch: 2
@@ -570,7 +570,8 @@ rm -rf %{buildroot}%{_unitdir}/ceph-volume@.service
 rm -rf %{buildroot}%{_unitdir}/ceph.target
 rm -rf %{buildroot}%{python_sitelib}/ceph_detect_init*
 rm -rf %{buildroot}%{python_sitelib}/ceph_disk*
-rm -rf %{buildroot}%{python_sitelib}/ceph_volume*
+rm -rf %{buildroot}%{python_sitelib}/ceph_volume/*
+rm -rf %{buildroot}%{python_sitelib}/ceph_volume-*
 rm -rf %{buildroot}%{_mandir}/man8/ceph-deploy.8*
 rm -rf %{buildroot}%{_mandir}/man8/ceph-detect-init.8*
 rm -rf %{buildroot}%{_mandir}/man8/ceph-create-keys.8*
diff --git a/ceph.changes b/ceph.changes
index eeb9e04..bea2717 100644
--- a/ceph.changes
+++ b/ceph.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Aug 04 20:16:27 UTC 2017 - ncutler@suse.com
+
+- Update to version 12.1.2+git.1501876501.4c219a30d6:
+  + debian: include ceph-volume python
+  + ceph.spec.in: ceph_volume but not ceph_volume_client in ceph-base
+
 -------------------------------------------------------------------
 Fri Aug  4 16:59:59 UTC 2017 - ncutler@suse.com
 
diff --git a/ceph.spec b/ceph.spec
index 757d03c..5eed6c0 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -68,7 +68,7 @@
 # main package definition
 #################################################################################
 Name:		ceph
-Version:	12.1.2+git.1501865907.88dc8cdc9d
+Version:	12.1.2+git.1501876501.4c219a30d6
 Release:	0%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
@@ -1016,7 +1016,8 @@ rm -rf %{buildroot}
 %{_unitdir}/ceph.target
 %{python_sitelib}/ceph_detect_init*
 %{python_sitelib}/ceph_disk*
-%{python_sitelib}/ceph_volume*
+%{python_sitelib}/ceph_volume/*
+%{python_sitelib}/ceph_volume-*
 %{_mandir}/man8/ceph-deploy.8*
 %{_mandir}/man8/ceph-detect-init.8*
 %{_mandir}/man8/ceph-create-keys.8*