Combine Service & Lib pkg

Change-Id: Ia2b8d615b6b1ab64f56926b5c2ee10b914d49d02
Signed-off-by: youngman <yman.jung@samsung.com>

diff --git a/packaging/iotcon-old.manifest b/packaging/iotcon-old.manifest
index b0453bc..bba84dc 100644 (file)
--- a/packaging/iotcon-old.manifest
+++ b/packaging/iotcon-old.manifest
@@ -19,6 +19,7 @@
        </define>
        <assign>
                <filesystem path="/usr/share/license/iotcon" label="_" />
+               <filesystem path="/usr/lib/libiotcon.so.*" label="_" />
 
                <dbus name="org.tizen.iotcon.dbus" own="iotcon" bus="system">
                        <node name="/org/tizen/iotcon/dbus">

diff --git a/packaging/iotcon.spec b/packaging/iotcon.spec
index 0018370..fcb5e08 100644 (file)
--- a/packaging/iotcon.spec
+++ b/packaging/iotcon.spec
@@ -8,8 +8,7 @@ Source0:    %{name}-%{version}.tar.gz
 Source1:    %{name}.service
 Source1001: %{name}.manifest
 Source1002: %{name}-old.manifest
-Source1003: lib%{name}-old.manifest
-Source1004: %{name}-test-old.manifest
+Source1003: %{name}-test-old.manifest
 Source2001: %{name}.conf.in
 BuildRequires:  cmake
 BuildRequires:  boost-devel
@@ -26,22 +25,13 @@ BuildRequires:  python-xml
 %define _unitdir /usr/lib/systemd/system
 
 %description
-Tizen IoT Connectivity based on Iotivity
-
-
-%package lib
-Summary:    Tizen IoT Connectivity Library
-Group:      Network & Connectivity/Libraries
-Requires:   %{name} = %{version}
-
-%description lib
-Tizen IoT Connectivity Library(Client) for applications.
+Tizen IoT Connectivity Service & Library(Client) based on Iotivity
 
 
 %package devel
 Summary:    TizenIoT Connectivity(devel)
 Group:      Network & Connectivity/Development
-Requires:   %{name}-lib = %{version}
+Requires:   %{name} = %{version}
 
 %description devel
 IoT Connectivity Manager development Kit
@@ -50,7 +40,7 @@ IoT Connectivity Manager development Kit
 %package test
 Summary:    Tizen IoT Connectivity(test)
 Group:      Network & Connectivity/Testing
-Requires:   %{name}-lib = %{version}
+Requires:   %{name} = %{version}
 
 %description test
 Tizen IoT Connectivity Test Programs
@@ -61,11 +51,9 @@ Tizen IoT Connectivity Test Programs
 chmod g-w %_sourcedir/*
 %if 0%{?tizen_version_major} < 3
 cp %{SOURCE1002} ./%{name}.manifest
-cp %{SOURCE1003} ./lib%{name}.manifest
-cp %{SOURCE1004} ./%{name}-test.manifest
+cp %{SOURCE1003} ./%{name}-test.manifest
 %else
 cp %{SOURCE1001} ./%{name}.manifest
-cp %{SOURCE1001} ./lib%{name}.manifest
 cp %{SOURCE1001} ./%{name}-test.manifest
 cp %{SOURCE2001} .
 %endif
@@ -94,7 +82,6 @@ ln -s ../%{name}.service %{buildroot}%{_unitdir}/multi-user.target.wants/%{name}
 %if 0%{?tizen_version_major} < 3
 mkdir -p %{buildroot}/%{_datadir}/license
 cp LICENSE.APLv2 %{buildroot}/%{_datadir}/license/%{name}
-cp LICENSE.APLv2 %{buildroot}/%{_datadir}/license/%{name}-lib
 %endif
 
 
@@ -103,6 +90,7 @@ systemctl daemon-reload
 if [ $1 == 1 ]; then
     systemctl restart %{name}.service
 fi
+/sbin/ldconfig
 
 %postun
 /sbin/ldconfig
@@ -110,10 +98,7 @@ if [ $1 == 0 ]; then
     systemctl stop %{name}.service
 fi
 systemctl daemon-reload
-
-
-%post lib -p /sbin/ldconfig
-%postun lib -p /sbin/ldconfig
+/sbin/ldconfig
 
 
 %files
@@ -122,6 +107,7 @@ systemctl daemon-reload
 %{_unitdir}/%{name}.service
 %{_unitdir}/multi-user.target.wants/%{name}.service
 %{_bindir}/%{name}-daemon
+%{_libdir}/lib%{name}.so.*
 %if 0%{?tizen_version_major} < 3
 %{_datadir}/license/%{name}
 %else
@@ -129,16 +115,6 @@ systemctl daemon-reload
 %license LICENSE.APLv2
 %endif
 
-%files lib
-%manifest lib%{name}.manifest
-%defattr(-,root,root,-)
-%{_libdir}/lib%{name}.so.*
-%if 0%{?tizen_version_major} < 3
-%{_datadir}/license/%{name}-lib
-%else
-%license LICENSE.APLv2
-%endif
-
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/lib%{name}.so

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