update from RIFT as of 696b75d2fe9fb046261b08c616f1bcf6c0b54a9b second try

[osm/SO.git] / rwlaunchpad / plugins / rwlaunchpadtasklet / CMakeLists.txt

diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/CMakeLists.txt b/rwlaunchpad/plugins/rwlaunchpadtasklet/CMakeLists.txt
index 34463ef..c02e728 100644 (file)
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/CMakeLists.txt
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/CMakeLists.txt
@@ -24,7 +24,7 @@ set(TASKLET_NAME rwlaunchpad)
 ##
 # This function creates an install target for the plugin artifacts
 ##
-rift_install_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py)
+rift_install_gobject_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py COMPONENT ${INSTALL_COMPONENT})
 
 # Workaround RIFT-6485 - rpmbuild defaults to python2 for
 # anything not in a site-packages directory so we have to
@@ -34,7 +34,6 @@ rift_python_install_tree(
   FILES
     rift/tasklets/${TASKLET_NAME}/__init__.py
     rift/tasklets/${TASKLET_NAME}/convert_pkg.py
-    rift/tasklets/${TASKLET_NAME}/datacenters.py
     rift/tasklets/${TASKLET_NAME}/export.py
     rift/tasklets/${TASKLET_NAME}/extract.py
     rift/tasklets/${TASKLET_NAME}/image.py
@@ -44,16 +43,14 @@ rift_python_install_tree(
     rift/tasklets/${TASKLET_NAME}/tasklet.py
     rift/tasklets/${TASKLET_NAME}/tosca.py
     rift/tasklets/${TASKLET_NAME}/uploader.py
-  COMPONENT ${PKG_LONG_NAME}
+  COMPONENT ${INSTALL_COMPONENT}
   PYTHON3_ONLY)
 
 rift_python_install_tree(
   FILES
     rift/package/__init__.py
     rift/package/archive.py
-    rift/package/charm.py
     rift/package/checksums.py
-    rift/package/config.py
     rift/package/convert.py
     rift/package/handler.py
     rift/package/icon.py
@@ -62,7 +59,7 @@ rift_python_install_tree(
     rift/package/script.py
     rift/package/store.py
     rift/package/cloud_init.py
-  COMPONENT ${PKG_LONG_NAME}
+  COMPONENT ${INSTALL_COMPONENT}
   PYTHON3_ONLY)
 
 rift_add_subdirs(test scripts)