From: Kefu Chai <kchai@redhat.com>
Date: Thu, 24 May 2018 08:21:48 +0000 (+0800)
Subject: deb,rpm: package librgw_admin_user.{h,so.*}
X-Git-Tag: v14.0.0~30^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F22205%2Fhead;p=ceph.git

deb,rpm: package librgw_admin_user.{h,so.*}

* install and package librgw_admin_user.h, so developers can use it to
  create rgw user.
* package librgw_admin_user, so user can use it to create rgw user.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 32f8885e060..25ba2391d5f 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -1655,6 +1655,7 @@ fi
 
 %files -n librgw2
 %{_libdir}/librgw.so.*
+%{_libdir}/librgw_admin_user.so.*
 %if %{with lttng}
 %{_libdir}/librgw_op_tp.so*
 %{_libdir}/librgw_rados_tp.so*
@@ -1667,8 +1668,10 @@ fi
 %files -n librgw-devel
 %dir %{_includedir}/rados
 %{_includedir}/rados/librgw.h
+%{_includedir}/rados/librgw_admin_user.h
 %{_includedir}/rados/rgw_file.h
 %{_libdir}/librgw.so
+%{_libdir}/librgw_admin_user.so
 
 %if 0%{with python2}
 %files -n python-rgw
diff --git a/debian/librgw-dev.install b/debian/librgw-dev.install
index ed2a81dba50..1f4f1b190ba 100644
--- a/debian/librgw-dev.install
+++ b/debian/librgw-dev.install
@@ -1,3 +1,5 @@
 usr/include/rados/librgw.h
+usr/include/rados/librgw_admin_user.h
 usr/include/rados/rgw_file.h
 usr/lib/librgw.so
+usr/lib/librgw_admin_user.so
diff --git a/debian/librgw2.install b/debian/librgw2.install
index b86fb891e2c..725f341affa 100644
--- a/debian/librgw2.install
+++ b/debian/librgw2.install
@@ -1 +1,2 @@
 usr/lib/librgw.so.*
+usr/lib/librgw_admin_user.so.*
diff --git a/src/include/CMakeLists.txt b/src/include/CMakeLists.txt
index 49e31ac960e..23aec6ba698 100644
--- a/src/include/CMakeLists.txt
+++ b/src/include/CMakeLists.txt
@@ -27,5 +27,6 @@ if(WITH_RADOSGW)
   install(FILES
     rados/librgw.h
     rados/rgw_file.h
+    rgw/librgw_admin_user.h
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rados)
 endif()