Replace package name to libdynamicbox_viewer

[model] Redwood,Kiran,B3(Wearable)
[binary_type] AP
[customer] Docomo/Orange/ATT/Open
[issue#] N/A
[problem] "Livebox" keyword is already reserved, we have to replace it with official name.
[cause] Open to public
[solution]
[team] HomeTF
[request]
[horizontal_expansion]

Change-Id: I882cefd3859caf95b6a85202fd09c5c06a1f1a35

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8a4056..08adf20 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-IF (DYNAMICBOX_ENABLED)
 PROJECT(dynamicbox_viewer C)
-ELSE (DYNAMICBOX_ENABLED)
-PROJECT(livebox-viewer C)
-ENDIF (DYNAMICBOX_ENABLED)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
@@ -18,33 +14,17 @@ SET(CMAKE_SKIP_BUILD_RPATH true)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
 INCLUDE(FindPkgConfig)
-IF (DYNAMICBOX_ENABLED)
-       pkg_check_modules(pkgs REQUIRED
-               dlog
-               aul
-               glib-2.0
-               gio-2.0
-               com-core
-               sqlite3
-               db-util
-               dynamicbox_service
-               vconf
-       )
-ELSE (DYNAMICBOX_ENABLED)
-       pkg_check_modules(pkgs REQUIRED
-               dlog
-               aul
-               glib-2.0
-               gio-2.0
-               com-core
-               sqlite3
-               db-util
-               livebox-service
-               vconf
-       )
-ENDIF (DYNAMICBOX_ENABLED)
-
-
+pkg_check_modules(pkgs REQUIRED
+       dlog
+       aul
+       glib-2.0
+       gio-2.0
+       com-core
+       sqlite3
+       db-util
+       dynamicbox_service
+       vconf
+)
 
 IF (X11_SUPPORT)
 pkg_check_modules(pkgs_extra REQUIRED
@@ -101,11 +81,6 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME}
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib)
 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_viewer)
-ELSE (DYNAMICBOX_ENABLED)
-       INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/livebox.h DESTINATION include/${PROJECT_NAME})
-       INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/dynamicbox.h DESTINATION include/dynamicbox_viewer)
-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-viewer.pc.in b/livebox-viewer.pc.in
deleted file mode 100644 (file)
index 06f4891..0000000
--- a/livebox-viewer.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=@EXEC_PREFIX@
-libdir=@LIBDIR@
-includedir=@INCLUDEDIR@
-
-Name: livebox-viewer
-Description: livebox supporting library
-Version: @VERSION@
-Libs: -L${libdir} -llivebox-viewer
-Cflags: -I${includedir}
-cppflags: -I${includedir}

diff --git a/packaging/libdynamicbox_viewer.spec_ b/packaging/libdynamicbox_viewer.spec
similarity index 90%
rename from packaging/libdynamicbox_viewer.spec_
rename to packaging/libdynamicbox_viewer.spec
index c55e919..ff2e87d 100644 (file)
--- a/packaging/libdynamicbox_viewer.spec_
+++ b/packaging/libdynamicbox_viewer.spec
@@ -2,9 +2,9 @@
 
 Name: libdynamicbox_viewer
 Summary: Library for developing the application
-Version: 0.31.5
+Version: 1.0.0
 Release: 1
-Group: HomeTF/Livebox
+Group: HomeTF/DynamicBox
 License: Flora
 Source0: %{name}-%{version}.tar.gz
 Source1001: %{name}.manifest
@@ -33,7 +33,7 @@ ExclusiveArch:
 API for creating a new instance of the dynamicbox and managing its life-cycle.
 
 %package devel
-Summary: Livebox viewer development library (dev)
+Summary: Development Library for Dynamic Box Viewer Application (dev)
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
@@ -72,10 +72,10 @@ make %{?jobs:-j%jobs}
 rm -rf %{buildroot}
 %make_install
 
-%post -n libdynamicbox_viewer -p /sbin/ldconfig
-%postun -n libdynamicbox_viewer -p /sbin/ldconfig
+%post -n %{name} -p /sbin/ldconfig
+%postun -n %{name} -p /sbin/ldconfig
 
-%files -n libdynamicbox_viewer
+%files -n %{name}
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/*.so*

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

diff --git a/packaging/liblivebox-viewer.spec b/packaging/liblivebox-viewer.spec
deleted file mode 100644 (file)
index dfc74b7..0000000
--- a/packaging/liblivebox-viewer.spec
+++ /dev/null
@@ -1,91 +0,0 @@
-%bcond_with wayland
-
-Name: liblivebox-viewer
-Summary: Library for developing the application
-Version: 0.31.5
-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(aul)
-BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(gio-2.0)
-BuildRequires: pkgconfig(com-core)
-BuildRequires: pkgconfig(sqlite3)
-BuildRequires: pkgconfig(db-util)
-BuildRequires: pkgconfig(livebox-service)
-BuildRequires: pkgconfig(vconf)
-
-%if %{with wayland}
-%else
-BuildRequires: pkgconfig(x11)
-BuildRequires: pkgconfig(xext)
-%endif
-
-%if "%{sec_product_feature_livebox}" == "0"
-ExclusiveArch:
-%endif
-
-%description
-API for creating a new instance of the livebox and managing its life-cycle.
-
-%package devel
-Summary: Livebox viewer development library (dev)
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-Header and package configuration files for the livebox viewer 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
-
-%post -n liblivebox-viewer -p /sbin/ldconfig
-%postun -n liblivebox-viewer -p /sbin/ldconfig
-
-%files -n liblivebox-viewer
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%{_libdir}/*.so*
-%{_datarootdir}/license/*
-
-%files devel
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%{_includedir}/livebox-viewer/livebox.h
-%{_includedir}/dynamicbox_viewer/dynamicbox.h
-%{_libdir}/pkgconfig/*.pc
-
-# End of a file