X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fosp-appfw.spec;h=ddb8d4c8d85cbccbf02ca0921ce40d935d14dbc5;hb=9f055e2b0a3eb97a6164242019e57d37ebf1c668;hp=c40e072504875f695485486a94dfe85632076326;hpb=426b996dc87c7c1144749f40edafc971a445126c;p=platform%2Fframework%2Fnative%2Fappfw.git

diff --git a/packaging/osp-appfw.spec b/packaging/osp-appfw.spec
old mode 100755
new mode 100644
index c40e072..ddb8d4c
--- a/packaging/osp-appfw.spec
+++ b/packaging/osp-appfw.spec
@@ -1,12 +1,9 @@
-%define debug_package %{nil}
-%define __strip /bin/true
-
 Name:       osp-appfw
 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)
@@ -49,6 +46,7 @@ BuildRequires:	pkgconfig(edbus)
 BuildRequires:	pkgconfig(efreet)
 BuildRequires:	pkgconfig(ethumb)
 BuildRequires:  pkgconfig(icu-i18n)
+BuildRequires:  pkgconfig(iniparser)
 BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(libssl)
 BuildRequires:  pkgconfig(libsoup-2.4)
@@ -73,6 +71,7 @@ BuildRequires:  boost-devel
 BuildRequires:  gettext-tools
 BuildRequires:  pkgconfig(security-server)
 BuildRequires:  pkgconfig(badge)
+BuildRequires:  pkgconfig(appinfo) >= 0.1.0
 
 # runtime requires
 Requires: capi-appfw-application
@@ -83,8 +82,9 @@ Requires: capi-system-runtime-info
 Requires: capi-security-privilege-manager
 Requires: chromium
 Requires: message-port
-Requires: osp-env-config
+Requires: osp-env-config >= 1.2.2.1
 Requires: sqlite
+Requires: iniparser
 
 Provides:   libosp-appfw.so.1, libosp-newlib.so.1
 
@@ -113,30 +113,29 @@ Requires:   %{name} = %{version}-%{release}
 %description internal-devel
 The App Framework library of OSP (Internal-DEV)
 
-%package debug
-Summary:    The App Framework library of OSP (Development)
-Group:      TO_BE/FILLED_IN
-Requires:   %{name} = %{version}-%{release}
-
-%description debug
-The App Framework library of OSP (DEV)
-
 %prep
 %setup -q
 
 %build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %ifarch %{ix86}
+%if 0%{?simulator}
 CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_X86_ -D_OSP_EMUL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DOBS=1 -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DARCH=x86
 %else
+CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_X86_ " cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DOBS=1 -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DARCH=x86
+%endif
+%else
 CXXFLAGS="-O2 -g -pipe -Wall -fno-exceptions -Wformat -Wformat-security -Wl,--as-needed -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -D__SOFTFP__ -mthumb -Wa,-mimplicit-it=thumb -funwind-tables -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_ARMEL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DOBS=1 -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DARCH=arm
 %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 +171,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*
@@ -200,8 +198,3 @@ chmod 444 /opt/usr/etc/clocale.list
 %{_libdir}/pkgconfig/osp-appfw-server.pc
 %{_libdir}/pkgconfig/osp-system-server.pc
 
-%files debug
-%{_libdir}/osp/debug/libosp-appfw.so*
-%{_libdir}/osp/debug/libosp-newlib.so*
-%{_libdir}/osp-server/debug/libosp-appfw-server.so*
-%{_libdir}/osp-server/debug/libosp-system-server.so*