Merge "[content] Use _LocalizedNumParser::ToDouble() because locale" into tizen_2.2

diff --git a/inc/FCntContentTransferInfo.h b/inc/FCntContentTransferInfo.h
index 23c2982..9038b19 100644 (file)
--- a/inc/FCntContentTransferInfo.h
+++ b/inc/FCntContentTransferInfo.h
@@ -38,14 +38,14 @@ class IContentTransferListener;
  * Defines the content transfer status.
  *
  * @since      2.0
- * #endif
+ * @endif
  */
 enum  ContentTransferStatus
 {
-       CONTENT_TRANSFER_STATUS_NONE,                                                                   /**< None */
-       CONTENT_TRANSFER_STATUS_DOWNLOADING,                                    /**< The Downloading status */
-       CONTENT_TRANSFER_STATUS_DOWNLOAD_COMPLETED,     /**<  The Download completed status */
-       CONTENT_TRANSFER_STATUS_DOWNLOAD_READY,                         /**<  The Download ready status */
+       CONTENT_TRANSFER_STATUS_NONE,                                                                   /**< @if OSPDEPREC None @endif */
+       CONTENT_TRANSFER_STATUS_DOWNLOADING,                                    /**< @if OSPDEPREC The Downloading status @endif*/
+       CONTENT_TRANSFER_STATUS_DOWNLOAD_COMPLETED,     /**< @if OSPDEPREC The Download completed status @endif*/
+       CONTENT_TRANSFER_STATUS_DOWNLOAD_READY,                         /**< @if OSPDEPREC The Download ready status @endif*/
 };
 
 /**

diff --git a/packaging/osp-content.spec b/packaging/osp-content.spec
index 95e9d1b..4815829 100644 (file)
--- a/packaging/osp-content.spec
+++ b/packaging/osp-content.spec
@@ -3,8 +3,8 @@
 
 Name:          osp-content
 Summary:       osp content library
-Version:       1.2.1.0
-Release:       2
+Version:       1.2.2.0
+Release:       0
 Group:         System/Libraries
 License:       Apache License, Version 2.0
 Source0:       %{name}-%{version}.tar.gz