Merge "remove redundant files" into tizen_2.2

diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 90b814e..a210271
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,7 +61,6 @@ INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/debug/ DESTINATION lib/osp/debug
                                        GROUP_EXECUTE GROUP_READ
                                        WORLD_EXECUTE WORLD_READ)
 
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/common/opt/usr/share/.osp-compat/share DESTINATION ../opt/usr/share/.osp-compat)
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/common/opt/usr/etc DESTINATION ../opt/usr)
 IF("${ARCH}" MATCHES "arm")
   INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/arm/usr/etc DESTINATION ../usr)

diff --git a/packaging/osp-appfw.spec b/packaging/osp-appfw.spec
old mode 100755 (executable)
new mode 100644 (file)
index c40e072..447d580
--- a/packaging/osp-appfw.spec
+++ b/packaging/osp-appfw.spec
@@ -6,7 +6,7 @@ Summary:    The App Framework library of OSP
 Version:    1.2.2.1
 Release:    1
 Group:      TO_BE/FILLED_IN
-License:    Apache License, Version 2.0 or Flora
+License:    Apache-2.0 or Flora
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(capi-appfw-application)
@@ -133,10 +133,13 @@ CXXFLAGS="-O2 -g -pipe -Wall -fno-exceptions -Wformat -Wformat-security -Wl,--as
 %endif
 
 # Call make instruction with smp support
-make %{?jobs:-j%jobs}
+#make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
-%install
+%clean
 rm -rf %{buildroot}
+
+%install
 mkdir -p %{buildroot}/usr/share/license
 cp %{_builddir}/%{name}-%{version}/LICENSE.Flora  %{buildroot}/usr/share/license/%{name}
 cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2  %{buildroot}/usr/share/license/%{name}
@@ -172,11 +175,10 @@ chmod 444 /opt/usr/etc/clocale.list
 %files
 %manifest osp-appfw.manifest
 /usr/share/license/%{name}
-/etc/*
-/opt/usr/share/.osp-compat/share/*
-/opt/usr/etc/*
+%config /etc/*
+%config /opt/usr/etc/*
 /usr/share/locale/*
-/usr/etc/*
+%config /usr/etc/*
 %{_libdir}/osp/libosp-appfw.so*
 %{_libdir}/osp/libosp-newlib.so*
 %{_libdir}/osp-server/libosp-appfw-server.so*

diff --git a/res/common/opt/usr/share/.osp-compat/share/AppControl/ac-calendar/TestEvent.vcs b/res/common/opt/usr/share/.osp-compat/share/AppControl/ac-calendar/TestEvent.vcs
deleted file mode 100755 (executable)
index 15eb7e1..0000000
--- a/res/common/opt/usr/share/.osp-compat/share/AppControl/ac-calendar/TestEvent.vcs
+++ /dev/null
@@ -1,11 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:1.0
-BEGIN:VEVENT
-SUMMARY;ENCODING=QUOTED-PRINTABLE;CHARSET=UTF-8:Event
-DESCRIPTION;ENCODING=QUOTED-PRINTABLE;CHARSET=UTF-8:Event Viewer Test
-DTSTART:20100120T020000Z
-DTEND:20100120T030000Z
-LAST-MODIFIED:20100120T022156Z
-CATEGORIES:MEETING
-END:VEVENT
-END:VCALENDAR

diff --git a/res/common/opt/usr/share/.osp-compat/share/AppControl/ac-calendar/TestMemo.vnt b/res/common/opt/usr/share/.osp-compat/share/AppControl/ac-calendar/TestMemo.vnt
deleted file mode 100755 (executable)
index ce8bdb7..0000000
--- a/res/common/opt/usr/share/.osp-compat/share/AppControl/ac-calendar/TestMemo.vnt
+++ /dev/null
@@ -1,6 +0,0 @@
-BEGIN:VNOTE\r
-VERSION:1.1\r
-BODY;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:Memotest\r
-DCREATED:20110102T055700\r
-LAST-MODIFIED:20110102T055742\r
-END:VNOTE\r

diff --git a/res/common/opt/usr/share/.osp-compat/share/AppControl/ac-calendar/TestTodo.vcs b/res/common/opt/usr/share/.osp-compat/share/AppControl/ac-calendar/TestTodo.vcs
deleted file mode 100755 (executable)
index 5cc8373..0000000
--- a/res/common/opt/usr/share/.osp-compat/share/AppControl/ac-calendar/TestTodo.vcs
+++ /dev/null
@@ -1,12 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:1.0
-BEGIN:VTODO
-SUMMARY;ENCODING=QUOTED-PRINTABLE;CHARSET=UTF-8:Task 
-DESCRIPTION;ENCODING=QUOTED-PRINTABLE;CHARSET=UTF-8:Task Viewer Test
-DTSTART:20100109T050000Z
-DUE:20100110T000000Z
-PRIORITY:3
-STATUS:NEEDS ACTION
-LAST-MODIFIED:20100110T212057Z
-END:VTODO
-END:VCALENDAR

diff --git a/res/common/opt/usr/share/.osp-compat/share/AppControl/ac-contact/TestContact.vcf b/res/common/opt/usr/share/.osp-compat/share/AppControl/ac-contact/TestContact.vcf
deleted file mode 100755 (executable)
index dbab149..0000000
--- a/res/common/opt/usr/share/.osp-compat/share/AppControl/ac-contact/TestContact.vcf
+++ /dev/null
@@ -1,9 +0,0 @@
-BEGIN:VCARD
-N;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:Anderson;Thomas;;;
-FN;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:Thomas Anderson
-VERSION:2.1
-TEL;CELL; MOBILE; VOICE:01000010001
-TEL;HOME; VOICE:0285634127
-EMAIL;WORK; INTERNET;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:tom@bada.com
-REV:20110103T132410
-END:VCARD