upload tizen1.0 source

6 files changed, 22 insertions, 13 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41556fd..a852fc9 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,8 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(INC_DIR include)
 INCLUDE_DIRECTORIES(${INC_DIR})
 
-SET(dependents "dlog calendar-service glib-2.0 capi-social-contacts")
+SET(dependents "dlog calendar-service glib-2.0 capi-base-common capi-social-contacts")
+SET(pc_dependents "capi-base-common")
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(${fw_name} REQUIRED ${dependents})
@@ -50,9 +51,8 @@ INSTALL(
         )
 
 SET(PC_NAME ${fw_name})
-SET(PC_REQUIRED ${dependents})
+SET(PC_REQUIRED ${pc_dependents})
 SET(PC_LDFLAGS -l${fw_name})
-SET(PC_CFLAGS -I\${includedir}/social)
 
 CONFIGURE_FILE(
     ${fw_name}.pc.in
diff --git a/capi-social-calendar.pc.in b/capi-social-calendar.pc.in
index d48ca91..ebddc47 100755
--- a/capi-social-calendar.pc.in
+++ b/capi-social-calendar.pc.in
@@ -11,5 +11,5 @@ Description: @PACKAGE_DESCRIPTION@
 Version: @VERSION@
 Requires: @PC_REQUIRED@ 
 Libs: -L${libdir} @PC_LDFLAGS@
-Cflags: -I${includedir} @PC_CFLAGS@
+Cflags: -I${includedir}
 
diff --git a/debian/changelog b/debian/changelog
index e79a5ae..6f1192c 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+capi-social-calendar (0.1.1-33) unstable; urgency=low
+
+  * package build dependency updated
+  * Git: api/calendar
+  * Tag: capi-social-calendar_0.1.1-33 
+
+ -- Jonghoon Lim <j.h.lim@samsung.com>  Fri, 16 Mar 2012 12:01:32 +0900
+
 capi-social-calendar (0.1.1-32) unstable; urgency=low
 
   * Multiple calendar feature added
diff --git a/debian/control b/debian/control
index d462109..e527c5a 100755
--- a/debian/control
+++ b/debian/control
@@ -7,12 +7,12 @@ Build-Depends: debhelper (>= 5), dlog-dev, libslp-calendar-dev, libglib2.0-dev,
 
 Package: capi-social-calendar
 Architecture: any
-Depends: ${shilbs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Calendar library in Tizen Native API
 
 Package: capi-social-calendar-dev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, capi-social-calendar (= ${Source-Version}), dlog-dev, libslp-calendar-dev, libglib2.0-dev, capi-base-common-dev, capi-social-contacts-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, capi-social-calendar (= ${Source-Version}), capi-base-common-dev
 Description: Calendar library in Tizen Native API (DEV)
 
 Package: capi-social-calendar-dbg
diff --git a/include/calendar_private.h b/include/calendar_private.h
index 68c7967..18d1bcc 100755
--- a/include/calendar_private.h
+++ b/include/calendar_private.h
@@ -18,9 +18,8 @@
 #ifndef __TIZEN_SOCIAL_CALENDAR_PRIVATE_H__
 #define	__TIZEN_SOCIAL_CALENDAR_PRIVATE_H__
 
-#include <calendar.h>
+#include <glib.h>
 #include <calendar_types.h>
-#include <calendar-svc-provider.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/packaging/capi-social-calendar.spec b/packaging/capi-social-calendar.spec
index 33692d1..ddc8939 100755
--- a/packaging/capi-social-calendar.spec
+++ b/packaging/capi-social-calendar.spec
@@ -1,7 +1,7 @@
 Name:       capi-social-calendar
 Summary:    Calendar library in Tizen Native API
 Version:    0.1.1
-Release:    1
+Release:    35
 Group:      TO_BE/FILLED_IN
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
@@ -12,6 +12,8 @@ BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(alarm-service)
 BuildRequires:  pkgconfig(capi-social-contacts)
 BuildRequires:  pkgconfig(capi-base-common)
+BuildRequires:  pkgconfig(calendar-service)
+
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -32,9 +34,8 @@ Requires: %{name} = %{version}-%{release}
 
 
 %build
-FULLVER=%{version}
-MAJORVER=`echo ${FULLVER} | cut -d '.' -f 1`
-cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=${FULLVER} -DMAJORVER=${MAJORVER}
+MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
+cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 
 
 make %{?jobs:-j%jobs}
@@ -49,10 +50,11 @@ rm -rf %{buildroot}
 
 
 %files
-%{_libdir}/libcapi-social-calendar.so*
+%{_libdir}/libcapi-social-calendar.so.*
 
 %files devel
 %{_includedir}/social/*.h
 %{_libdir}/pkgconfig/*.pc
+%{_libdir}/libcapi-social-calendar.so