Use %license macro in spec file

- Add manifest file in libtfeature

Change-Id: I869784e4140cc6cacec7879b69867ffd0fe2f7d6

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8bb7d99..5f9bae8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,7 +57,6 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/500.mcc_mnc_oper_list_upgrade_24_30.sh DES
 IF (OPERATOR_CDMA)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/cdma_mcc_sid_list.sql DESTINATION /tmp RENAME mcc_sid_list.sql)
 ENDIF (OPERATOR_CDMA)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME tel-plugin-database)
 
 ### add subdirectory ###
 ADD_SUBDIRECTORY(feature)

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

diff --git a/packaging/tel-plugin-database.spec b/packaging/tel-plugin-database.spec
index 05202e0..88c10e1 100644 (file)
--- a/packaging/tel-plugin-database.spec
+++ b/packaging/tel-plugin-database.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 1
-%define patchlevel 31
+%define patchlevel 32
 
 Name:           tel-plugin-database
 Version:        %{major}.%{minor}.%{patchlevel}
@@ -82,9 +82,9 @@ chsmack -a System %TZ_SYS_DB/.mcc_mnc_oper_list.db-journal
 
 %install
 %make_install
-mkdir -p %{buildroot}%{_datadir}/license
 
 %files
+%manifest %{name}.manifest
 %defattr(644,root,root,-)
 /tmp/mcc_mnc_oper_list.sql
 %if 0%{?sec_product_feature_telephony_cdma}
@@ -93,10 +93,10 @@ mkdir -p %{buildroot}%{_datadir}/license
 #%doc COPYING
 %{_libdir}/telephony/plugins/db-plugin*
 %{_datadir}/upgrade/scripts/500.mcc_mnc_oper_list_upgrade_24_30.sh
-%{_datadir}/license/tel-plugin-database
-
+%license LICENSE
 
 %files -n libtfeature
+%manifest feature/libtfeature.manifest
 %defattr(644,root,root,-)
 %{_libdir}/*.so