Change package name of efl_widget_base

The package name is changed to component-based-efl-widget.

Change-Id: I174ba188869ef9299d5f2231bd9960d0a0c6e578
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

diff --git a/component_based/CMakeLists.txt b/component_based/CMakeLists.txt
index 9af8cbcea52217e78715dfd10b2dcd6093c57400..d0178132dbb71091446d3267143d97fc8adec55b 100644 (file)
--- a/component_based/CMakeLists.txt
+++ b/component_based/CMakeLists.txt
@@ -12,4 +12,4 @@ ADD_DEPENDENCIES(component-based-app-control component-based-uri)
 ADD_DEPENDENCIES(component-based-core-base component-based-app-control)
 ADD_DEPENDENCIES(component-based-application component-based-core-base)
 ADD_DEPENDENCIES(component-based-core-widget-base component-based-core-base)
-ADD_DEPENDENCIES(component-based-widget-application component-based-core-widget-base)
+ADD_DEPENDENCIES(component-based-efl-widget component-based-core-widget-base)

diff --git a/component_based/efl_widget_base/CMakeLists.txt b/component_based/efl_widget_base/CMakeLists.txt
index e1f3a3b08d67f224c58731cceb5c4d7624449f6d..61b314684d5aa8c61fafff7be6c89d8fe9f10782 100644 (file)
--- a/component_based/efl_widget_base/CMakeLists.txt
+++ b/component_based/efl_widget_base/CMakeLists.txt
@@ -1,5 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(component-based-widget-application CXX)
+PROJECT(component-based-efl-widget CXX)
 
 SET(PREFIX "${CMAKE_INSTALL_PREFIX}")
 SET(EXEC_PREFIX "\${prefix}")
@@ -11,9 +11,9 @@ SET(VERSION ${FULLVER})
 INCLUDE(FindPkgConfig)
 SET(requires "glib-2.0 bundle dlog ecore-wl2 elementary capi-appfw-app-control")
 SET(pc_requires "elementary component-based-core-widget-base")
-pkg_check_modules(component-based-widget-application REQUIRED ${requires})
+pkg_check_modules(component-based-efl-widget REQUIRED ${requires})
 
-FOREACH(flag ${component-based-widget-application_CFLAGS})
+FOREACH(flag ${component-based-efl-widget_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -Wall -Werror -Winline -std=c++11")
@@ -34,9 +34,9 @@ ADD_LIBRARY(${PROJECT_NAME} SHARED ${SOURCES})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${MAJORVER})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${FULLVER})
 
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${component-based-widget-application_LDFLAGS} component-based-core-widget-base)
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${component-based-efl-widget_LDFLAGS} component-based-core-widget-base)
 
-SET(PC_NAME component-based-widget-application)
+SET(PC_NAME component-based-efl-widget)
 SET(PC_REQUIRED ${pc_requires})
 
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)

diff --git a/component_based/efl_widget_base/component-based-efl-widget.pc.in b/component_based/efl_widget_base/component-based-efl-widget.pc.in
new file mode 100644 (file)
index 0000000..a78298f
--- /dev/null
+++ b/component_based/efl_widget_base/component-based-efl-widget.pc.in
@@ -0,0 +1,11 @@
+prefix=@PREFIX@
+exec_prefix=@EXEC_PREFIX@
+libdir=@LIB_INSTALL_DIR@
+includedir=@INCLUDE_INSTALL_DIR@
+
+Name: @PC_NAME@
+Description: Support development of the Tizen Extensive App Model
+Version: @VERSION@
+Requires: @PC_REQUIRED@
+Libs: -L${libdir} -lcomponent-based-core-widget-base -lcomponent-based-efl-widget
+Cflags: -I${includedir} -I${includedir}/appfw -I${includedir}/component_based -I${includedir}/component_based/api -I${includedir}/component_based/efl_base -I${includedir}/component_based/efl_base/api -I${includedir}/component_based/widget_base -I${includedir}/component_based/widget_base/api -I${includedir}/component_based/efl_widget_base -I${includedir}/component_based/efl_widget_base/api

diff --git a/component_based/efl_widget_base/component-based-widget-application.pc.in b/component_based/efl_widget_base/component-based-widget-application.pc.in
deleted file mode 100644 (file)
index 2e57c72..0000000
--- a/component_based/efl_widget_base/component-based-widget-application.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=@EXEC_PREFIX@
-libdir=@LIB_INSTALL_DIR@
-includedir=@INCLUDE_INSTALL_DIR@
-
-Name: @PC_NAME@
-Description: Support development of the Tizen Extensive App Model
-Version: @VERSION@
-Requires: @PC_REQUIRED@
-Libs: -L${libdir} -lcomponent-based-core-widget-base -lcomponent-based-widget-application
-Cflags: -I${includedir} -I${includedir}/appfw -I${includedir}/component_based -I${includedir}/component_based/api -I${includedir}/component_based/efl_base -I${includedir}/component_based/efl_base/api -I${includedir}/component_based/widget_base -I${includedir}/component_based/widget_base/api -I${includedir}/component_based/efl_widget_base -I${includedir}/component_based/efl_widget_base/api

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

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

diff --git a/packaging/component-based.spec b/packaging/component-based.spec
index 275767618d1547bbffffe7f531c83f7fc669c3c4..b5826180f395cc87612cd42ab98fe5e04869f477 100644 (file)
--- a/packaging/component-based.spec
+++ b/packaging/component-based.spec
@@ -8,7 +8,7 @@ Source0:    %{name}-%{version}.tar.gz
 Source1001: %{name}.manifest
 Source1002: %{name}-application.manifest
 Source1003: %{name}-widget.manifest
-Source1004: %{name}-widget-application.manifest
+Source1004: %{name}-efl-widget.manifest
 Source1005: %{name}-port.manifest
 
 Requires(post):   /sbin/ldconfig
@@ -77,15 +77,15 @@ Header & package configuration files to support development of the component-bas
 # component-based-widget
 #################################################
 %package -n %{name}-widget
-Summary: Library for developing the component-based widget application
+Summary: Library for developing the component-based widget component
 Group: Application Framework/Core
 License: Apache-2.0
 
 %description -n %{name}-widget
-Provider APIs to develop the component-based widget application
+Provider APIs to develop the component-based widget component
 
 %package -n %{name}-widget-devel
-Summary: Component-based widget application development library (dev)
+Summary: Component-based widget component development library (dev)
 Group: Development/Libraries
 Requires: %{name}-widget = %{version}-%{release}
 
@@ -93,23 +93,23 @@ Requires: %{name}-widget = %{version}-%{release}
 Header & package configuration files to support development of the component-based widget
 
 #################################################
-# component-based-widget-application
+# component-based-efl-widget
 #################################################
-%package -n %{name}-widget-application
-Summary: Library for developing the component-based efl widget application
+%package -n %{name}-efl-widget
+Summary: Library for developing the component-based efl widget component
 Group: Application Framework/Core
 License: Apache-2.0
 
-%description -n %{name}-widget-application
-Provider APIs to develop the component-based efl widget application
+%description -n %{name}-efl-widget
+Provider APIs to develop the component-based efl widget component
 
-%package -n %{name}-widget-application-devel
-Summary: Component-based efl widget application development library (dev)
+%package -n %{name}-efl-widget-devel
+Summary: Component-based efl widget component development library (dev)
 Group: Development/Libraries
-Requires: %{name}-widget-application = %{version}-%{release}
+Requires: %{name}-efl-widget = %{version}-%{release}
 
-%description -n %{name}-widget-application-devel
-Header & package configuration files to support development of the component-based efl widget application.
+%description -n %{name}-efl-widget-devel
+Header & package configuration files to support development of the component-based efl widget component.
 
 #################################################
 # component-based-port
@@ -201,32 +201,26 @@ install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj
 
 %preun
 
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
-%post -n %{name}-application
-/sbin/ldconfig
-
-%postun -n %{name}-application
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
+%post -n %{name}-application -p /sbin/ldconfig
+%postun -n %{name}-application -p/sbin/ldconfig
 
 %post -n %{name}-widget -p /sbin/ldconfig
 %postun -n %{name}-widget -p /sbin/ldconfig
 
-%post -n %{name}-widget-application -p /sbin/ldconfig
-%postun -n %{name}-widget-application -p /sbin/ldconfig
+%post -n %{name}-efl-widget -p /sbin/ldconfig
+%postun -n %{name}-efl-widget -p /sbin/ldconfig
 
+%post -n %{name}-port -p /sbin/ldconfig
+%postun -n %{name}-port -p /sbin/ldconfig
 
 %post unittests
 %if 0%{?gcov:1}
 %{_bindir}/component-based_unittests
 %endif
 
-
 %files -n %{name}
 %manifest %{name}.manifest
 %license LICENSE
@@ -276,18 +270,18 @@ install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj
 %{_libdir}/libcomponent-based-core-widget-base.so
 
 #################################################
-# component-based-widget-application
+# component-based-efl-widget
 #################################################
-%files -n %{name}-widget-application
+%files -n %{name}-efl-widget
 %license LICENSE
-%manifest %{name}-widget-application.manifest
-%attr(0644,root,root) %{_libdir}/libcomponent-based-widget-application.so.*
+%manifest %{name}-efl-widget.manifest
+%attr(0644,root,root) %{_libdir}/libcomponent-based-efl-widget.so.*
 
-%files -n %{name}-widget-application-devel
+%files -n %{name}-efl-widget-devel
 %{_includedir}/component_based/efl_widget_base/*.h
 %{_includedir}/component_based/efl_widget_base/api/*.h
-%{_libdir}/pkgconfig/component-based-widget-application.pc
-%{_libdir}/libcomponent-based-widget-application.so
+%{_libdir}/pkgconfig/component-based-efl-widget.pc
+%{_libdir}/libcomponent-based-efl-widget.so
 
 #################################################
 # component-based-port