Obsolete libslp-tapi

This package should obsolete libslp-tapi since it replaces it.

Also fixed groups and use %license to package the license file.

Change-Id: If0bc5a2f237e9e8e0d344995063a2bae543dd7bd
Signed-off-by: Anas Nashif <anas.nashif@intel.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index be757edbf5248e864cf94eeaf6628f4058ad990f..71a7bb91bd72b53b3e4f817b6f92a064cbb75ebb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,4 +54,3 @@ CONFIGURE_FILE(tapi.pc.in tapi.pc @ONLY)
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include/telephony-client)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tapi.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 INSTALL(TARGETS tapi DESTINATION ${LIB_INSTALL_DIR} COMPONENT Runtime)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME libtapi)

diff --git a/packaging/libtapi.spec b/packaging/libtapi.spec
index 0c220c0e5a01c02dd85949b7b9c91bcc9a377172..d7d86f70084a8af8ffa07a1b0c0500bd517ed6f4 100644 (file)
--- a/packaging/libtapi.spec
+++ b/packaging/libtapi.spec
@@ -2,7 +2,7 @@ Name: libtapi
 Summary: Telephony dbus client library
 Version: 0.6.70
 Release:    2
-Group:      System/Libraries
+Group:      Telephony/Libraries
 License:    Apache-2.0
 Source0:    libtapi-%{version}.tar.gz
 Source1001:    libtapi.manifest
@@ -11,13 +11,13 @@ BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(security-server)
-
+Obsoletes:      libslp-tapi <= 0.6.69
+Provides:       libslp-tapi
 %description
 Telephony client API library
 
 %package devel
 Summary:    Telephony client API (devel)
-Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
@@ -32,15 +32,12 @@ cp %{SOURCE1001} .
 %build
 %cmake .
 
-
 make %{?jobs:-j%jobs}
 
 %install
-rm -rf %{buildroot}
 %make_install
 
 rm -rf %{buildroot}/usr/include/telephony/tapi/.gitignore
-mkdir -p %{buildroot}/usr/share/license
 
 %post -p /sbin/ldconfig
 
@@ -49,9 +46,9 @@ mkdir -p %{buildroot}/usr/share/license
 
 %files
 %manifest %{name}.manifest
+%license LICENSE
 %defattr(-,root,root,-)
 %{_libdir}/*.so.*
-/usr/share/license/libtapi
 
 %files devel
 %manifest %{name}.manifest