Replace liblivebox with libdynamicbox

[model] Redwood,Kiran,B3(Wearable)
[binary_type] AP
[customer] Docomo/Orange/ATT/Open
[issue#] N/A
[problem]
[cause]
[solution]
[team] HomeTF
[request]
[horizontal_expansion]

Change-Id: Ib8c609136cd8153b9c45b0ac2d4a57930a8c32c3

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a76d8e5..a4a8fbf 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-IF (DYNAMICBOX_ENABLED)
 PROJECT(dynamicbox C)
-ELSE (DYNAMICBOX_ENABLED)
-PROJECT(livebox C)
-ENDIF (DYNAMICBOX_ENABLED)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
@@ -57,7 +53,7 @@ SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden")
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -g")
 
 ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")
-ADD_DEFINITIONS("-DLOG_TAG=\"LIVEBOX\"")
+ADD_DEFINITIONS("-DLOG_TAG=\"DYNAMICBOX\"")
 ADD_DEFINITIONS("-DNDEBUG")
 ADD_DEFINITIONS("-D_USE_ECORE_TIME_GET")
 ADD_DEFINITIONS("-DMASTER_PKGNAME=\"data-provider-master\"")
@@ -83,13 +79,7 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME}
 
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
        
-IF (DYNAMICBOX_ENABLED)
-       INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/dynamicbox.h DESTINATION include/dynamicbox)
-ELSE (DYNAMICBOX_ENABLED)
-       INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/livebox.h DESTINATION include/${PROJECT_NAME})
-       INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/livebox_product.h DESTINATION include/${PROJECT_NAME})
-       INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/dynamicbox.h DESTINATION include/${PROJECT_NAME})
-ENDIF (DYNAMICBOX_ENABLED)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/dynamicbox.h DESTINATION include/${PROJECT_NAME})
 
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME "lib${PROJECT_NAME}")
        

diff --git a/livebox.pc.in b/livebox.pc.in
deleted file mode 100644 (file)
index 60193d3..0000000
--- a/livebox.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=@EXEC_PREFIX@
-libdir=@LIBDIR@
-includedir=@INCLUDEDIR@
-
-Name: livebox
-Description: livebox supporting library
-Version: @VERSION@
-Libs: -L${libdir} -llivebox
-Cflags: -I${includedir}
-cppflags: -I${includedir}

diff --git a/packaging/libdynamicbox.spec_ b/packaging/libdynamicbox.spec
similarity index 86%
rename from packaging/libdynamicbox.spec_
rename to packaging/libdynamicbox.spec
index 48b101f..87229c0 100644 (file)
--- a/packaging/libdynamicbox.spec_
+++ b/packaging/libdynamicbox.spec
@@ -2,15 +2,15 @@
 
 Name: libdynamicbox
 Summary: Dynamicbox development library
-Version: 0.9.3
+Version: 1.0.0
 Release: 1
-Group: HomeTF/Livebox
+Group: HomeTF/DynamicBox
 License: Flora
 Source0: %{name}-%{version}.tar.gz
 Source1001: %{name}.manifest
 BuildRequires: cmake, gettext-tools, coreutils
 BuildRequires: pkgconfig(dlog)
-BuildRequires: pkgconfig(livebox-service)
+BuildRequires: pkgconfig(dynamicbox_service)
 BuildRequires: pkgconfig(provider)
 BuildRequires: pkgconfig(ecore)
 BuildRequires: pkgconfig(evas)
@@ -29,7 +29,7 @@ ExclusiveArch:
 Library for the development of a dynamicbox 
 
 %package devel
-Summary: Livebox development library (dev)
+Summary: Dynamic Box development library (dev)
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
@@ -61,7 +61,7 @@ export WAYLAND_SUPPORT=Off
 export X11_SUPPORT=On
 %endif
 
-%cmake . -DWAYLAND_SUPPORT=${WAYLAND_SUPPORT} -DX11_SUPPORT=${X11_SUPPORT} -DDYNAMICBOX_ENABLED=On
+%cmake . -DWAYLAND_SUPPORT=${WAYLAND_SUPPORT} -DX11_SUPPORT=${X11_SUPPORT}
 make %{?jobs:-j%jobs}
 
 %install
@@ -69,10 +69,10 @@ rm -rf %{buildroot}
 %make_install
 mkdir -p %{buildroot}/%{_datarootdir}/license
 
-%post -n libdynamicbox -p /sbin/ldconfig
-%postun -n libdynamicbox -p /sbin/ldconfig
+%post -n %{name} -p /sbin/ldconfig
+%postun -n ${name} -p /sbin/ldconfig
 
-%files -n libdynamicbox
+%files -n %{name}
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/*.so*

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

diff --git a/packaging/liblivebox.spec b/packaging/liblivebox.spec
deleted file mode 100644 (file)
index 48a8294..0000000
--- a/packaging/liblivebox.spec
+++ /dev/null
@@ -1,90 +0,0 @@
-%bcond_with wayland
-
-Name: liblivebox
-Summary: Livebox development library
-Version: 0.9.4
-Release: 1
-Group: HomeTF/Livebox
-License: Flora
-Source0: %{name}-%{version}.tar.gz
-Source1001: %{name}.manifest
-BuildRequires: cmake, gettext-tools, coreutils
-BuildRequires: pkgconfig(dlog)
-BuildRequires: pkgconfig(livebox-service)
-BuildRequires: pkgconfig(provider)
-BuildRequires: pkgconfig(ecore)
-BuildRequires: pkgconfig(evas)
-BuildRequires: pkgconfig(elementary)
-
-%if %{with wayland}
-%else
-BuildRequires: pkgconfig(x11)
-%endif
-
-%if "%{sec_product_feature_livebox}" == "0"
-ExclusiveArch:
-%endif
-
-%description
-Library for the development of a livebox 
-
-%package devel
-Summary: Livebox development library (dev)
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-Header & Package configuration files for livebox development
-
-%prep
-%setup -q
-cp %{SOURCE1001} .
-
-%build
-%if 0%{?sec_build_binary_debug_enable}
-export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
-export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
-export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
-%endif
-
-%if 0%{?tizen_build_binary_release_type_eng}
-export CFLAGS="${CFLAGS} -DTIZEN_ENGINEER_MODE"
-export CXXFLAGS="${CXXFLAGS} -DTIZEN_ENGINEER_MODE"
-export FFLAGS="${FFLAGS} -DTIZEN_ENGINEER_MODE"
-%endif
-
-%if %{with wayland}
-export WAYLAND_SUPPORT=On
-export X11_SUPPORT=Off
-%else
-export WAYLAND_SUPPORT=Off
-export X11_SUPPORT=On
-%endif
-
-%cmake . -DWAYLAND_SUPPORT=${WAYLAND_SUPPORT} -DX11_SUPPORT=${X11_SUPPORT}
-make %{?jobs:-j%jobs}
-
-%install
-rm -rf %{buildroot}
-%make_install
-mkdir -p %{buildroot}/%{_datarootdir}/license
-
-%post -n liblivebox -p /sbin/ldconfig
-%postun -n liblivebox -p /sbin/ldconfig
-
-%files -n liblivebox
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%{_libdir}/*.so*
-%{_datarootdir}/license/*
-
-%files devel
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%{_includedir}/livebox/livebox.h
-%{_includedir}/livebox/livebox_product.h
-%{_libdir}/pkgconfig/*.pc
-
-%{_includedir}/livebox/dynamicbox.h
-
-# End of a file