lib: libpass: Rename to libpass.pc and add libpass.co to libpass-devel pkg

Rename the pkgconfig file name from pass.pc to libpass.pc
and add libpass.so to libpass-devel package

Change-Id: I45fcb5546a72586c263d2727a30040545d96820c
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1bf42e..ba83e67 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,7 +91,7 @@ SET(LIBDIR ${CMAKE_LIBDIR_PREFIX})
 ADD_DEFINITIONS("-DLOG_TAG=\"PASS\"")
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DFACTORYFS=\"$ENV{FACTORYFS}\"")
-ADD_DEFINITIONS("-DLIBPATH=\"${LIB_INSTALL_DIR}\"")
+ADD_DEFINITIONS("-DLIBPATH=\"${LIBDIR}\"")
 
 ADD_CUSTOM_COMMAND(
         OUTPUT src/pass/pass-dbus-stub.c

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 8119f45..4f6a41d 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -38,12 +38,12 @@ SET_TARGET_PROPERTIES( ${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES( ${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
 SET_TARGET_PROPERTIES( ${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${NAME})
 
-CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/packaging/${NAME}.pc.in
-       ${CMAKE_SOURCE_DIR}/packaging/${NAME}.pc
+CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/packaging/${PROJECT_NAME}.pc.in
+       ${CMAKE_SOURCE_DIR}/packaging/${PROJECT_NAME}.pc
        @ONLY)
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR})
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tmonitor/
        DESTINATION ${INCLUDEDIR}/${NAME}/
        FILES_MATCHING PATTERN "*.h")
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/packaging/${NAME}.pc
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/packaging/${PROJECT_NAME}.pc
        DESTINATION ${LIBDIR}/pkgconfig)

diff --git a/packaging/libpass.manifest b/packaging/libpass.manifest
new file mode 100644 (file)
index 0000000..97e8c31
--- /dev/null
+++ b/packaging/libpass.manifest
@@ -0,0 +1,5 @@
+<manifest>
+       <request>
+               <domain name="_"/>
+       </request>
+</manifest>

diff --git a/packaging/pass.pc.in b/packaging/libpass.pc.in
similarity index 69%
rename from packaging/pass.pc.in
rename to packaging/libpass.pc.in
index c3decdc..0f02466 100644 (file)
--- a/packaging/pass.pc.in
+++ b/packaging/libpass.pc.in
@@ -3,12 +3,14 @@
 package_name=pass
 prefix=@PREFIX@
 exec_prefix=@EXEC_PREFIX@
-libdir=@LIB_INSTALL_DIR@
+libdir=@LIBDIR@
 includedir=/usr/include/${package_name}
 
 Name: ${package_name}
-Description: --
-Version: @VERSION@
+Description: ${package_name} library
+Version: @VERSION@a
+
 Requires:
 Libs: -L${libdir} -l${package_name}
 Cflags: -I${includedir}
+CXXflags: -I${includedir}

diff --git a/packaging/pass.spec b/packaging/pass.spec
index 0a5aa54..dd933af 100644 (file)
--- a/packaging/pass.spec
+++ b/packaging/pass.spec
@@ -13,6 +13,7 @@ Group:      System/Kernel
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1:    %{name}.manifest
+Source2:    %{libpass_name}.manifest
 
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(dlog)
@@ -80,6 +81,7 @@ Tizen Monitor Headler Files
 
 %build
 cp %{SOURCE1} .
+cp %{SOURCE2} .
 make %{?jobs:-j%jobs}
 
 %install
@@ -126,11 +128,14 @@ systemctl daemon-reload
 
 %files -n %{libpass_name}
 %license LICENSE
-%manifest %{name}.manifest
+%manifest %{libpass_name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/*.so*
 
 %files -n %{libpass_name}-devel
+%license LICENSE
+%manifest %{libpass_name}.manifest
 %defattr(-,root,root,-)
 %{_includedir}/%{name}/*.h
-%{_libdir}/pkgconfig/%{name}.pc
+%{_libdir}/pkgconfig/%{libpass_name}.pc
+%{_libdir}/*.so*