Change in vdsm[master]: packaging: vdsm-api

sbonazzo at redhat.com sbonazzo at redhat.com
Fri Nov 27 10:33:20 UTC 2015


Sandro Bonazzola has uploaded a new change for review.

Change subject: packaging: vdsm-api
......................................................................

packaging: vdsm-api

- Extracted vdsm-api sub package in its own vdsm-api.spec.inc
- Included vdsm-api.spec.inc in vdsm.spec.in
- Debian: updated vdsm-api
- Moved vdsmapi-gluster-schema.json exclusion to vdsm-gluster
  where it is included if gluster is anabled.

See: https://gerrit.ovirt.org/49298

Change-Id: I1b5e8180592583a94557abf80c4f71d3a79a32b8
Signed-off-by: Sandro Bonazzola <sbonazzo at redhat.com>
---
M Makefile.am
M debian/Makefile.am
M debian/control
M debian/vdsm-api.install
A vdsm-api.spec.inc
M vdsm.spec.in
6 files changed, 28 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/07/49307/1

diff --git a/Makefile.am b/Makefile.am
index 97717ab..91ae103 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,6 +45,7 @@
 	contrib/logdb \
 	contrib/profile-stats \
 	pylintrc \
+	vdsm-api.spec.inc \
 	vdsm-cli.spec.inc \
 	vdsm.spec \
 	vdsm.spec.in \
diff --git a/debian/Makefile.am b/debian/Makefile.am
index 154c49f..4ebf19e 100644
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -29,6 +29,8 @@
     rules \
     source \
     TODO \
+    vdsm-api.docs \
+    vdsm-api.install \
     vdsm-cli.install \
     vdsm.dirs \
     vdsm.docs \
diff --git a/debian/control b/debian/control
index 1a6c247..61e0e34 100644
--- a/debian/control
+++ b/debian/control
@@ -342,6 +342,10 @@
 Depends: python (>=2.7.3)
 Description: VDSM API
  Contains api schema files
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ python (>=2.7.3)
 
 Package: vdsm-xmlrpc
 Architecture: all
diff --git a/debian/vdsm-api.install b/debian/vdsm-api.install
index a8bc24a..6bbe0cb 100644
--- a/debian/vdsm-api.install
+++ b/debian/vdsm-api.install
@@ -1,3 +1,3 @@
-./usr/share/vdsm/rpc/process-schema.py
-./usr/share/vdsm/api/vdsmapi.py
-./usr/share/vdsm/api/__init__.py*
\ No newline at end of file
+usr/share/vdsm/rpc/vdsmapi-schema.json
+usr/lib/python2.7/dist-packages/api/vdsmapi.py
+usr/lib/python2.7/dist-packages/api/__init__.py
diff --git a/vdsm-api.spec.inc b/vdsm-api.spec.inc
new file mode 100644
index 0000000..58b082e
--- /dev/null
+++ b/vdsm-api.spec.inc
@@ -0,0 +1,13 @@
+%package api
+Summary:       VDSM API
+
+%description api
+Contains api schema files
+
+%files api
+%doc lib/api/vdsm-api.html
+%dir %{_datadir}/%{vdsm_name}
+%dir %{_datadir}/%{vdsm_name}/rpc
+%{_datadir}/%{vdsm_name}/rpc/vdsmapi-schema.json
+%{python_sitelib}/api/vdsmapi.py*
+%{python_sitelib}/api/__init__.py*
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 6c6e226..0b73942 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -273,15 +273,11 @@
 networks as well as virtual machine creation, other host administration
 tasks, statistics gathering, and log collection.
 
+
+%include vdsm-api.spec.inc
 %include vdsm-cli.spec.inc
 %include vdsm-xmlrpc.spec.inc
 
-
-%package api
-Summary:       VDSM API
-
-%description api
-Contains api schema files
 
 %package jsonrpc
 Summary:        VDSM API Server
@@ -1441,12 +1437,14 @@
 %{_datadir}/%{vdsm_name}/gluster/api.py*
 %{_datadir}/%{vdsm_name}/gluster/apiwrapper.py*
 %{_datadir}/%{vdsm_name}/gluster/fstab.py*
-%{_datadir}/%{vdsm_name}/rpc/vdsmapi-gluster-schema.json
 %{_datadir}/%{vdsm_name}/gluster/gfapi.py*
 %{_datadir}/%{vdsm_name}/gluster/hooks.py*
 %{_datadir}/%{vdsm_name}/gluster/services.py*
 %{_datadir}/%{vdsm_name}/gluster/storagedev.py*
 %{_datadir}/%{vdsm_name}/gluster/tasks.py*
+%{_datadir}/%{vdsm_name}/rpc/vdsmapi-gluster-schema.json
+%else
+%exclude %{_datadir}/%{vdsm_name}/rpc/vdsmapi-gluster-schema.json
 %endif
 
 %changelog


-- 
To view, visit https://gerrit.ovirt.org/49307
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b5e8180592583a94557abf80c4f71d3a79a32b8
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Sandro Bonazzola <sbonazzo at redhat.com>


More information about the vdsm-patches mailing list