Rename package name

- capi-battery-monitor -> capi-system-battery-monitor

Change-Id: If38fbe6d34e75ca0f9a55add3b059ab8ff16fdb4
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d7503ff1ed09b7a1285e04be02d6c821518a8b0..a4302ebe50df9b688ea229b80037a55df8266f5f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(capi-battery-monitor)
+PROJECT(capi-system-battery-monitor)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 

diff --git a/capi-battery-monitor-devel.manifest b/capi-battery-monitor-devel.manifest
deleted file mode 100644 (file)
index 81ace0c..0000000
--- a/capi-battery-monitor-devel.manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-<manifest>
-       <request>
-               <domain name="_"/>
-       </request>
-</manifest>
-

diff --git a/capi-battery-monitor.manifest b/capi-battery-monitor.manifest
deleted file mode 100644 (file)
index 81ace0c..0000000
--- a/capi-battery-monitor.manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-<manifest>
-       <request>
-               <domain name="_"/>
-       </request>
-</manifest>
-

diff --git a/capi-battery-monitor.pc.in b/capi-battery-monitor.pc.in
deleted file mode 100644 (file)
index 328ec23..0000000
--- a/capi-battery-monitor.pc.in
+++ /dev/null
@@ -1,15 +0,0 @@
-# Package Information for pkg-config
-
-prefix=@PREFIX@
-exec_prefix=/usr
-libdir=@LIB_INSTALL_DIR@
-includedir=@INCLUDE_INSTALL_DIR@
-
-Name: @PC_NAME@
-Description: @PACKAGE_DESCRIPTION@
-Version: @VERSION@
-Requires: @PC_REQUIRED@
-Libs: -L${libdir} @PC_LDFLAGS@
-Cflags: -I${includedir}
-
-

diff --git a/capi-system-battery-monitor-devel.manifest b/capi-system-battery-monitor-devel.manifest
new file mode 100644 (file)
index 0000000..81ace0c
--- /dev/null
+++ b/capi-system-battery-monitor-devel.manifest
@@ -0,0 +1,6 @@
+<manifest>
+       <request>
+               <domain name="_"/>
+       </request>
+</manifest>
+

diff --git a/capi-system-battery-monitor.manifest b/capi-system-battery-monitor.manifest
new file mode 100644 (file)
index 0000000..81ace0c
--- /dev/null
+++ b/capi-system-battery-monitor.manifest
@@ -0,0 +1,6 @@
+<manifest>
+       <request>
+               <domain name="_"/>
+       </request>
+</manifest>
+

diff --git a/capi-system-battery-monitor.pc.in b/capi-system-battery-monitor.pc.in
new file mode 100644 (file)
index 0000000..328ec23
--- /dev/null
+++ b/capi-system-battery-monitor.pc.in
@@ -0,0 +1,15 @@
+# Package Information for pkg-config
+
+prefix=@PREFIX@
+exec_prefix=/usr
+libdir=@LIB_INSTALL_DIR@
+includedir=@INCLUDE_INSTALL_DIR@
+
+Name: @PC_NAME@
+Description: @PACKAGE_DESCRIPTION@
+Version: @VERSION@
+Requires: @PC_REQUIRED@
+Libs: -L${libdir} @PC_LDFLAGS@
+Cflags: -I${includedir}
+
+

diff --git a/include/battery_monitor.h b/include/battery_monitor.h
index d951b64dce2219252d68c757eaaf4970a35bc8dd..6077fba80bc79a4cb2303b1264d2aa75feebd2f7 100644 (file)
--- a/include/battery_monitor.h
+++ b/include/battery_monitor.h
@@ -25,7 +25,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup  CAPI_BATTERY_MONITOR_MODULE
+ * @addtogroup  CAPI_SYSTEM_BATTERY_BATTERY_MONITOR_MODULE
  * @{
  */
 

diff --git a/packaging/capi-battery-monitor.spec b/packaging/capi-battery-monitor.spec
deleted file mode 100644 (file)
index 0127aa1..0000000
--- a/packaging/capi-battery-monitor.spec
+++ /dev/null
@@ -1,75 +0,0 @@
-Name:    capi-battery-monitor
-Summary: Battery Monitor Framework CAPI
-Version: 0.1
-Release: 1
-License: Apache-2.0
-Source0: %{name}-%{version}.tar.gz
-
-BuildRequires:  cmake
-BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(capi-base-common)
-BuildRequires:  pkgconfig(capi-system-info)
-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(gio-2.0)
-BuildRequires:  pkgconfig(gio-unix-2.0)
-BuildRequires:  pkgconfig(pkgmgr-info)
-BuildRequires:  pkgconfig(libtzplatform-config)
-BuildRequires:  pkgconfig(aul)
-
-%define BATTERY_MONITOR_LIBDIR %{TZ_SYS_GLOBALUSER_DATA}/battery-monitor
-
-%description
-
-%package devel
-Summary: Battery Monitor Framework CAPI (Development)
-Requires: %{name} = %{version}
-
-%description devel
-%devel_desc
-
-%package test
-Summary: Battery Monitor Framework test application
-Group:   TO_BE/FILLED
-Requires: %{name} = %{version}-%{release}
-
-%description test
-This package is for Battery Monitor Framework CAPI test application
-
-%prep
-%setup -q
-
-%build
-MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-       -DLIB_INSTALL_DIR=%{_libdir} \
-       -DBIN_INSTALL_DIR=%{_bindir} \
-       -DINCLUDE_INSTALL_DIR=%{_includedir} \
-       -DLIB_PATH=%{_lib} \
-       -DFULLVER=%{version} \
-       -DMAJORVER=${MAJORVER}
-
-make %{?jobs:-j%jobs}
-
-%install
-%make_install
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%license LICENSE
-%attr(644,-,-) %{_libdir}/lib%{name}.so
-%attr(644,-,-) %{_libdir}/lib%{name}.so.*
-
-%files devel
-%manifest %{name}-devel.manifest
-%defattr(-,root,root,-)
-%{_libdir}/pkgconfig/%{name}.pc
-%{_includedir}/*
-
-%files test
-%manifest %{name}.manifest
-%attr(777, service_fw, service_fw) %{_bindir}/bm-test

diff --git a/packaging/capi-system-battery-monitor.spec b/packaging/capi-system-battery-monitor.spec
new file mode 100644 (file)
index 0000000..1f9666e
--- /dev/null
+++ b/packaging/capi-system-battery-monitor.spec
@@ -0,0 +1,75 @@
+Name:    capi-system-battery-monitor
+Summary: Battery Monitor Framework CAPI
+Version: 0.1
+Release: 1
+License: Apache-2.0
+Source0: %{name}-%{version}.tar.gz
+
+BuildRequires:  cmake
+BuildRequires:  pkgconfig(dlog)
+BuildRequires:  pkgconfig(capi-base-common)
+BuildRequires:  pkgconfig(capi-system-info)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gio-2.0)
+BuildRequires:  pkgconfig(gio-unix-2.0)
+BuildRequires:  pkgconfig(pkgmgr-info)
+BuildRequires:  pkgconfig(libtzplatform-config)
+BuildRequires:  pkgconfig(aul)
+
+%define BATTERY_MONITOR_LIBDIR %{TZ_SYS_GLOBALUSER_DATA}/battery-monitor
+
+%description
+
+%package devel
+Summary: Battery Monitor Framework CAPI (Development)
+Requires: %{name} = %{version}
+
+%description devel
+%devel_desc
+
+%package test
+Summary: Battery Monitor Framework test application
+Group:   TO_BE/FILLED
+Requires: %{name} = %{version}-%{release}
+
+%description test
+This package is for Battery Monitor Framework CAPI test application
+
+%prep
+%setup -q
+
+%build
+MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+       -DLIB_INSTALL_DIR=%{_libdir} \
+       -DBIN_INSTALL_DIR=%{_bindir} \
+       -DINCLUDE_INSTALL_DIR=%{_includedir} \
+       -DLIB_PATH=%{_lib} \
+       -DFULLVER=%{version} \
+       -DMAJORVER=${MAJORVER}
+
+make %{?jobs:-j%jobs}
+
+%install
+%make_install
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%license LICENSE
+%attr(644,-,-) %{_libdir}/lib%{name}.so
+%attr(644,-,-) %{_libdir}/lib%{name}.so.*
+
+%files devel
+%manifest %{name}-devel.manifest
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/%{name}.pc
+%{_includedir}/*
+
+%files test
+%manifest %{name}.manifest
+%attr(777, service_fw, service_fw) %{_bindir}/bm-test