From 7b98bae2c75bb0afbf3b4dfd3418729094f7f667 Mon Sep 17 00:00:00 2001 From: Prajwal A N Date: Fri, 23 Jan 2015 15:57:24 +0900 Subject: [PATCH] Changed package name to resourced Changed package name from system-resource to resourced and made needed changes in related files. Also resolved some dependency errors in the spec file related to the package name. Change-Id: Ie4a675999a05ef8032c1d186fb2a8a5ab58db75a Signed-off-by: Prajwal A N --- CMakeLists.txt | 10 ++-------- include/data_usage.h | 4 ++-- include/rd-network.h | 2 +- libresourced.pc.in | 2 +- packaging/{system-resource.spec => resourced.spec} | 15 ++++----------- system-resource.pc.in => resourced.pc.in | 2 +- system-resource.manifest | 5 ----- 7 files changed, 11 insertions(+), 29 deletions(-) rename packaging/{system-resource.spec => resourced.spec} (94%) rename system-resource.pc.in => resourced.pc.in (86%) delete mode 100644 system-resource.manifest diff --git a/CMakeLists.txt b/CMakeLists.txt index d2a09ec..3496ac8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -SET(fw_name "system-resource") +SET(fw_name "resourced") SET(RESOURCED resourced) SET(LIBS libs) SET(PROC-STAT proc-stat) @@ -40,13 +40,7 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(INCLUDEDIR ${PREFIX}/include) SET(PC_NAME lib${RESOURCED}) SET(PC_NAME_DEPRECATED ${fw_name}) -SET(PC_REQUIRED "glib-2.0 - vconf - vconf-internal-keys - sqlite3 - dlog - edbus - eina") +SET(PC_REQUIRED "glib-2.0 vconf vconf-internal-keys sqlite3 dlog edbus eina") SET(PC_PROVIDED_LIBS "-l${PROC-STAT}") diff --git a/include/data_usage.h b/include/data_usage.h index 45bc817..e9bc215 100755 --- a/include/data_usage.h +++ b/include/data_usage.h @@ -171,7 +171,7 @@ typedef enum { */ enum { WARNING_THRESHOLD_DEFAULT, /**< for quota it means - system-resource will evaluate proper value, for restriction it + resourced will evaluate proper value, for restriction it means no warning */ WARNING_THRESHOLD_NONE, /**< means no threshold at all */ }; @@ -185,7 +185,7 @@ enum { * warning_send_threshold - threshold for warning notification on engress bytes * warning_rcv_threshold - threshold for warning notification on ingress bytes * value - WARNING_THRESHOLD_UNDEF means no threshold - * - WARNING_THRESHOLD_DEFAULT means system-resource will be + * - WARNING_THRESHOLD_DEFAULT means resourced will be * responsible for evaluation threshold value * The threshold value is amount of bytes remaining till blocking * diff --git a/include/rd-network.h b/include/rd-network.h index c2c9f00..4ebb281 100755 --- a/include/rd-network.h +++ b/include/rd-network.h @@ -844,7 +844,7 @@ network_error_e network_remove_quota_by_iftype( * warning_send_threshold - threshold for warning notification on engress bytes * warning_rcv_threshold - threshold for warning notification on ingress bytes * value - WARNING_THRESHOLD_UNDEF means no threshold - * - WARNING_THRESHOLD_DEFAULT means system-resource will be + * - WARNING_THRESHOLD_DEFAULT means resourced will be * responsible for evaluation threshold value * The threshold value is amount of bytes remaining till blocking * quota_type - at present it can be foreground quota or background diff --git a/libresourced.pc.in b/libresourced.pc.in index 225d2db..5dfce22 100644 --- a/libresourced.pc.in +++ b/libresourced.pc.in @@ -8,7 +8,7 @@ libdir=@LIB_INSTALL_DIR@ includedir=@INCLUDEDIR@ Name: @PC_NAME@ -Description: @PACKAGE_DESCRIPTION@ +Description: Tizen Resource management library Version: @VERSION@ Requires: @PC_REQUIRED@ Libs: -L${libdir} @PC_PROVIDED_LIBS@ diff --git a/packaging/system-resource.spec b/packaging/resourced.spec similarity index 94% rename from packaging/system-resource.spec rename to packaging/resourced.spec index b61d290..336a8e7 100644 --- a/packaging/system-resource.spec +++ b/packaging/resourced.spec @@ -1,8 +1,7 @@ -Name: system-resource +Name: resourced Summary: System Resource Information Version: 0.2.86 Release: 0 -VCS: magnolia/kernel/api/system-resource#submit/master/20131010.041510-19-gcf6121a4bcce9c122d4ea05fa9974ec7bac227d8 Group: System/Libraries License: Apache License, Version 2.0 Source0: %{name}-%{version}.tar.gz @@ -67,19 +66,17 @@ BuildRequires: pkgconfig(eina) Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig -Requires: system-resource-resourced = %{version}-%{release} -Requires: libresourced = %{version}-%{release} %if %{?logging_module} == ON BuildRequires: pkgconfig(libsystemd-journal) %endif %description +resourced %package resourced Summary: Resource Daemon Group: System/Libraries -Requires: %{name} = %{version}-%{release} %description resourced Resource Daemon @@ -95,7 +92,7 @@ Resource Daemon Library %package -n libresourced-devel Summary: Resource Daemon Library (Development) Group: System/Libraries -Requires: %{name} = %{version}-%{release} +Requires: libresourced = %{version}-%{release} %description -n libresourced-devel Resource Daemon Library (Development) @@ -137,7 +134,6 @@ make %{?jobs:-j%jobs} rm -rf %{buildroot} mkdir -p %{buildroot}/usr/share/license cp -f LICENSE %{buildroot}/usr/share/license/%{name} -cp -f LICENSE %{buildroot}/usr/share/license/%{name}-resourced cp -f LICENSE %{buildroot}/usr/share/license/libresourced %make_install @@ -213,11 +209,8 @@ fi %postun -p /sbin/ldconfig -%files +%files -n resourced /usr/share/license/%{name} -%manifest system-resource.manifest -%files resourced -/usr/share/license/%{name}-resourced %attr(-,root, root) %{_bindir}/resourced %if %{?network_state} == ON %config(noreplace) %attr(660,root,app) %{database_full_path} diff --git a/system-resource.pc.in b/resourced.pc.in similarity index 86% rename from system-resource.pc.in rename to resourced.pc.in index a832b4d..11dfe0e 100644 --- a/system-resource.pc.in +++ b/resourced.pc.in @@ -8,7 +8,7 @@ libdir=@LIB_INSTALL_DIR@ includedir=@INCLUDEDIR@ Name: @PC_NAME_DEPRECATED@ -Description: @PACKAGE_DESCRIPTION@ +Description: Tizen Resource management Daemon Version: @VERSION@ Requires: @PC_REQUIRED@ Libs: -L${libdir} @PC_PROVIDED_LIBS@ diff --git a/system-resource.manifest b/system-resource.manifest deleted file mode 100644 index 3256181..0000000 --- a/system-resource.manifest +++ /dev/null @@ -1,5 +0,0 @@ - - - - - -- 2.7.4