Update the resource-infomation.xml path

Change-Id: Ie4079ac34a66e23f6b1a4e5978acd06bd0130601

diff --git a/include_internal/parser/CResourceTableProvider.h b/include_internal/parser/CResourceTableProvider.h
index 9dc0176c365356277a9b00d3311b86eda0a86ab3..72cce058b91e5ea652f335236b1ca13eaabbecd8 100644 (file)
--- a/include_internal/parser/CResourceTableProvider.h
+++ b/include_internal/parser/CResourceTableProvider.h
@@ -20,7 +20,7 @@
 #include <string>\r
 #include <CModelInfo.h>\r
 \r
-#define PATH_DEFAULT "/etc/config/resource_information.xml"\r
+#define PATH_DEFAULT SYSCONFDIR"/multimedia/resource_information.xml"\r
 \r
 class CResourceTableProvider\r
 {\r

diff --git a/include_internal/parser/CResourceTableProviderLicense.h b/include_internal/parser/CResourceTableProviderLicense.h
index e04822dafcfa19b583987780134419e163eba257..9d439b147bfc48cea54ce04a908cf3c2326e1e42 100644 (file)
--- a/include_internal/parser/CResourceTableProviderLicense.h
+++ b/include_internal/parser/CResourceTableProviderLicense.h
@@ -21,7 +21,7 @@
 #include <map>\r
 #include <CModelInfo.h>\r
 \r
-#define LICENSE_PATH_DEFAULT "/etc/config/resource_information.xml"\r
+#define RESOURCE_PATH_DEFAULT SYSCONFDIR"/multimedia/resource_information.xml"\r
 \r
 class CResourceTableProviderLicense\r
 {\r

diff --git a/include_internal/parser/CResourceTableProviderSingle.h b/include_internal/parser/CResourceTableProviderSingle.h
index ee817a9c2c6aeb29ab1cba9b3bd9ae8e64d153b6..6a98e829d1e8e5b6b3820068a21a20aa20b21273 100644 (file)
--- a/include_internal/parser/CResourceTableProviderSingle.h
+++ b/include_internal/parser/CResourceTableProviderSingle.h
@@ -25,7 +25,7 @@ public:
 \r
        std::string GetResourceTablePath(void) { return DEFAULT_TABLE_PATH; }\r
 private:\r
-       const std::string DEFAULT_TABLE_PATH = "/etc/config/resource_information.xml";\r
+       const std::string DEFAULT_TABLE_PATH = SYSCONFDIR"/multimedia/resource_information.xml";\r
 };\r
 \r
 #endif // __CRESOURCE_PROVIDER_TABLE_SINGLE_H__\r

diff --git a/packaging/resource-information.spec b/packaging/resource-information.spec
index 700d031569fe23dcc45cada9ba37613faa31a177..5341b742797b79ea60a0089f9233604eb2dd63b3 100644 (file)
--- a/packaging/resource-information.spec
+++ b/packaging/resource-information.spec
@@ -1,7 +1,7 @@
 Name:       resource-information
 Summary:    Resource Information
 Version:    0.1
-Release:    0
+Release:    1
 Group:      Multimedia/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
@@ -68,7 +68,8 @@ Description: Unit testing package with gtest
 %endif
 
 %build
-
+export CFLAGS="$CFLAGS -DSYSCONFDIR=\\\"%{_hal_sysconfdir}\\\""
+export CXXFLAGS="$CXXFLAGS -DSYSCONFDIR=\\\"%{_hal_sysconfdir}\\\""
 
 %ifarch armv7l
 %else

diff --git a/src/parser/CResourceTableProviderLicense.cpp b/src/parser/CResourceTableProviderLicense.cpp
index 21b3832b20d6a894a112558891c5e97cfae8cc3e..6b96e3e67a14f528ab2a99c1e03dea6e36bdbacc 100644 (file)
--- a/src/parser/CResourceTableProviderLicense.cpp
+++ b/src/parser/CResourceTableProviderLicense.cpp
@@ -19,5 +19,5 @@
 
 std::string CResourceTableProviderLicense::GetResourceTablePath(void) const
 {
-       return LICENSE_PATH_DEFAULT;
+       return RESOURCE_PATH_DEFAULT;
 }